diff --git a/software/.defconfig b/buildroot/.defconfig
similarity index 100%
rename from software/.defconfig
rename to buildroot/.defconfig
diff --git a/software/.flake8 b/buildroot/.flake8
similarity index 100%
rename from software/.flake8
rename to buildroot/.flake8
diff --git a/software/.gitignore b/buildroot/.gitignore
similarity index 100%
rename from software/.gitignore
rename to buildroot/.gitignore
diff --git a/software/.gitlab-ci.yml b/buildroot/.gitlab-ci.yml
similarity index 100%
rename from software/.gitlab-ci.yml
rename to buildroot/.gitlab-ci.yml
diff --git a/software/.gitlab-ci.yml.in b/buildroot/.gitlab-ci.yml.in
similarity index 100%
rename from software/.gitlab-ci.yml.in
rename to buildroot/.gitlab-ci.yml.in
diff --git a/software/CHANGES b/buildroot/CHANGES
similarity index 100%
rename from software/CHANGES
rename to buildroot/CHANGES
diff --git a/software/COPYING b/buildroot/COPYING
similarity index 100%
rename from software/COPYING
rename to buildroot/COPYING
diff --git a/software/Config.in b/buildroot/Config.in
similarity index 100%
rename from software/Config.in
rename to buildroot/Config.in
diff --git a/software/Config.in.legacy b/buildroot/Config.in.legacy
similarity index 100%
rename from software/Config.in.legacy
rename to buildroot/Config.in.legacy
diff --git a/software/DEVELOPERS b/buildroot/DEVELOPERS
similarity index 100%
rename from software/DEVELOPERS
rename to buildroot/DEVELOPERS
diff --git a/software/Makefile b/buildroot/Makefile
similarity index 100%
rename from software/Makefile
rename to buildroot/Makefile
diff --git a/software/Makefile.legacy b/buildroot/Makefile.legacy
similarity index 100%
rename from software/Makefile.legacy
rename to buildroot/Makefile.legacy
diff --git a/software/README b/buildroot/README
similarity index 100%
rename from software/README
rename to buildroot/README
diff --git a/software/arch/Config.in b/buildroot/arch/Config.in
similarity index 100%
rename from software/arch/Config.in
rename to buildroot/arch/Config.in
diff --git a/software/arch/Config.in.arc b/buildroot/arch/Config.in.arc
similarity index 100%
rename from software/arch/Config.in.arc
rename to buildroot/arch/Config.in.arc
diff --git a/software/arch/Config.in.arm b/buildroot/arch/Config.in.arm
similarity index 100%
rename from software/arch/Config.in.arm
rename to buildroot/arch/Config.in.arm
diff --git a/software/arch/Config.in.csky b/buildroot/arch/Config.in.csky
similarity index 100%
rename from software/arch/Config.in.csky
rename to buildroot/arch/Config.in.csky
diff --git a/software/arch/Config.in.m68k b/buildroot/arch/Config.in.m68k
similarity index 100%
rename from software/arch/Config.in.m68k
rename to buildroot/arch/Config.in.m68k
diff --git a/software/arch/Config.in.microblaze b/buildroot/arch/Config.in.microblaze
similarity index 100%
rename from software/arch/Config.in.microblaze
rename to buildroot/arch/Config.in.microblaze
diff --git a/software/arch/Config.in.mips b/buildroot/arch/Config.in.mips
similarity index 100%
rename from software/arch/Config.in.mips
rename to buildroot/arch/Config.in.mips
diff --git a/software/arch/Config.in.nds32 b/buildroot/arch/Config.in.nds32
similarity index 100%
rename from software/arch/Config.in.nds32
rename to buildroot/arch/Config.in.nds32
diff --git a/software/arch/Config.in.nios2 b/buildroot/arch/Config.in.nios2
similarity index 100%
rename from software/arch/Config.in.nios2
rename to buildroot/arch/Config.in.nios2
diff --git a/software/arch/Config.in.or1k b/buildroot/arch/Config.in.or1k
similarity index 100%
rename from software/arch/Config.in.or1k
rename to buildroot/arch/Config.in.or1k
diff --git a/software/arch/Config.in.powerpc b/buildroot/arch/Config.in.powerpc
similarity index 100%
rename from software/arch/Config.in.powerpc
rename to buildroot/arch/Config.in.powerpc
diff --git a/software/arch/Config.in.riscv b/buildroot/arch/Config.in.riscv
similarity index 100%
rename from software/arch/Config.in.riscv
rename to buildroot/arch/Config.in.riscv
diff --git a/software/arch/Config.in.sh b/buildroot/arch/Config.in.sh
similarity index 100%
rename from software/arch/Config.in.sh
rename to buildroot/arch/Config.in.sh
diff --git a/software/arch/Config.in.sparc b/buildroot/arch/Config.in.sparc
similarity index 100%
rename from software/arch/Config.in.sparc
rename to buildroot/arch/Config.in.sparc
diff --git a/software/arch/Config.in.x86 b/buildroot/arch/Config.in.x86
similarity index 100%
rename from software/arch/Config.in.x86
rename to buildroot/arch/Config.in.x86
diff --git a/software/arch/Config.in.xtensa b/buildroot/arch/Config.in.xtensa
similarity index 100%
rename from software/arch/Config.in.xtensa
rename to buildroot/arch/Config.in.xtensa
diff --git a/software/arch/arch.mk b/buildroot/arch/arch.mk
similarity index 100%
rename from software/arch/arch.mk
rename to buildroot/arch/arch.mk
diff --git a/software/arch/arch.mk.arc b/buildroot/arch/arch.mk.arc
similarity index 100%
rename from software/arch/arch.mk.arc
rename to buildroot/arch/arch.mk.arc
diff --git a/software/arch/arch.mk.csky b/buildroot/arch/arch.mk.csky
similarity index 100%
rename from software/arch/arch.mk.csky
rename to buildroot/arch/arch.mk.csky
diff --git a/software/arch/arch.mk.riscv b/buildroot/arch/arch.mk.riscv
similarity index 100%
rename from software/arch/arch.mk.riscv
rename to buildroot/arch/arch.mk.riscv
diff --git a/software/arch/arch.mk.xtensa b/buildroot/arch/arch.mk.xtensa
similarity index 100%
rename from software/arch/arch.mk.xtensa
rename to buildroot/arch/arch.mk.xtensa
diff --git a/software/board/YuzukiHD/YuzukiRuler/YuzukiHD_YuzukiRuler_defconfig b/buildroot/board/YuzukiHD/YuzukiRuler/YuzukiHD_YuzukiRuler_defconfig
similarity index 100%
rename from software/board/YuzukiHD/YuzukiRuler/YuzukiHD_YuzukiRuler_defconfig
rename to buildroot/board/YuzukiHD/YuzukiRuler/YuzukiHD_YuzukiRuler_defconfig
diff --git a/software/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts b/buildroot/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts
similarity index 100%
rename from software/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts
rename to buildroot/board/YuzukiHD/YuzukiRuler/devicetree/linux/devicetree.dts
diff --git a/software/board/YuzukiHD/YuzukiRuler/devicetree/uboot/suniv-f1c100s-generic.dts b/buildroot/board/YuzukiHD/YuzukiRuler/devicetree/uboot/suniv-f1c100s-generic.dts
similarity index 100%
rename from software/board/YuzukiHD/YuzukiRuler/devicetree/uboot/suniv-f1c100s-generic.dts
rename to buildroot/board/YuzukiHD/YuzukiRuler/devicetree/uboot/suniv-f1c100s-generic.dts
diff --git a/software/board/YuzukiHD/YuzukiRuler/rootfs/etc/umtprd/umtprd.conf b/buildroot/board/YuzukiHD/YuzukiRuler/rootfs/etc/umtprd/umtprd.conf
similarity index 100%
rename from software/board/YuzukiHD/YuzukiRuler/rootfs/etc/umtprd/umtprd.conf
rename to buildroot/board/YuzukiHD/YuzukiRuler/rootfs/etc/umtprd/umtprd.conf
diff --git a/software/board/YuzukiHD/YuzukiRuler/rootfs/lib/firmware/goodix_911_cfg.bin b/buildroot/board/YuzukiHD/YuzukiRuler/rootfs/lib/firmware/goodix_911_cfg.bin
similarity index 100%
rename from software/board/YuzukiHD/YuzukiRuler/rootfs/lib/firmware/goodix_911_cfg.bin
rename to buildroot/board/YuzukiHD/YuzukiRuler/rootfs/lib/firmware/goodix_911_cfg.bin
diff --git a/software/board/YuzukiHD/YuzukiRuler/uboot.defconfig b/buildroot/board/YuzukiHD/YuzukiRuler/uboot.defconfig
similarity index 100%
rename from software/board/YuzukiHD/YuzukiRuler/uboot.defconfig
rename to buildroot/board/YuzukiHD/YuzukiRuler/uboot.defconfig
diff --git a/software/board/allwinner/generic/genimage-nand.cfg b/buildroot/board/allwinner/generic/genimage-nand.cfg
similarity index 100%
rename from software/board/allwinner/generic/genimage-nand.cfg
rename to buildroot/board/allwinner/generic/genimage-nand.cfg
diff --git a/software/board/allwinner/generic/genimage-nor.cfg b/buildroot/board/allwinner/generic/genimage-nor.cfg
similarity index 100%
rename from software/board/allwinner/generic/genimage-nor.cfg
rename to buildroot/board/allwinner/generic/genimage-nor.cfg
diff --git a/software/board/allwinner/generic/genimage-sdcard.cfg b/buildroot/board/allwinner/generic/genimage-sdcard.cfg
similarity index 100%
rename from software/board/allwinner/generic/genimage-sdcard.cfg
rename to buildroot/board/allwinner/generic/genimage-sdcard.cfg
diff --git a/software/board/allwinner/generic/kernel.its b/buildroot/board/allwinner/generic/kernel.its
similarity index 100%
rename from software/board/allwinner/generic/kernel.its
rename to buildroot/board/allwinner/generic/kernel.its
diff --git a/software/board/allwinner/generic/legacy/genimage-flasher.cfg b/buildroot/board/allwinner/generic/legacy/genimage-flasher.cfg
similarity index 100%
rename from software/board/allwinner/generic/legacy/genimage-flasher.cfg
rename to buildroot/board/allwinner/generic/legacy/genimage-flasher.cfg
diff --git a/software/board/allwinner/generic/legacy/uboot.env b/buildroot/board/allwinner/generic/legacy/uboot.env
similarity index 100%
rename from software/board/allwinner/generic/legacy/uboot.env
rename to buildroot/board/allwinner/generic/legacy/uboot.env
diff --git a/software/board/allwinner/generic/rootfs/overlay/.gitkeep b/buildroot/board/allwinner/generic/rootfs/overlay/.gitkeep
similarity index 100%
rename from software/board/allwinner/generic/rootfs/overlay/.gitkeep
rename to buildroot/board/allwinner/generic/rootfs/overlay/.gitkeep
diff --git a/software/board/allwinner/generic/rootfs/preinit b/buildroot/board/allwinner/generic/rootfs/preinit
similarity index 100%
rename from software/board/allwinner/generic/rootfs/preinit
rename to buildroot/board/allwinner/generic/rootfs/preinit
diff --git a/software/board/allwinner/generic/scripts/genimage.sh b/buildroot/board/allwinner/generic/scripts/genimage.sh
similarity index 100%
rename from software/board/allwinner/generic/scripts/genimage.sh
rename to buildroot/board/allwinner/generic/scripts/genimage.sh
diff --git a/software/board/allwinner/generic/scripts/mknanduboot.sh b/buildroot/board/allwinner/generic/scripts/mknanduboot.sh
similarity index 100%
rename from software/board/allwinner/generic/scripts/mknanduboot.sh
rename to buildroot/board/allwinner/generic/scripts/mknanduboot.sh
diff --git a/software/board/allwinner/generic/splash.bmp b/buildroot/board/allwinner/generic/splash.bmp
similarity index 100%
rename from software/board/allwinner/generic/splash.bmp
rename to buildroot/board/allwinner/generic/splash.bmp
diff --git a/software/board/allwinner/generic/uboot.env b/buildroot/board/allwinner/generic/uboot.env
similarity index 100%
rename from software/board/allwinner/generic/uboot.env
rename to buildroot/board/allwinner/generic/uboot.env
diff --git a/software/board/allwinner/sun8i-v3/devicetree/linux/sun8i-s3.dtsi b/buildroot/board/allwinner/sun8i-v3/devicetree/linux/sun8i-s3.dtsi
similarity index 100%
rename from software/board/allwinner/sun8i-v3/devicetree/linux/sun8i-s3.dtsi
rename to buildroot/board/allwinner/sun8i-v3/devicetree/linux/sun8i-s3.dtsi
diff --git a/software/board/allwinner/sun8i-v3/devicetree/linux/sun8i-v3s.dtsi b/buildroot/board/allwinner/sun8i-v3/devicetree/linux/sun8i-v3s.dtsi
similarity index 100%
rename from software/board/allwinner/sun8i-v3/devicetree/linux/sun8i-v3s.dtsi
rename to buildroot/board/allwinner/sun8i-v3/devicetree/linux/sun8i-v3s.dtsi
diff --git a/software/board/allwinner/sun8i-v3/linux.defconfig b/buildroot/board/allwinner/sun8i-v3/linux.defconfig
similarity index 100%
rename from software/board/allwinner/sun8i-v3/linux.defconfig
rename to buildroot/board/allwinner/sun8i-v3/linux.defconfig
diff --git a/software/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi b/buildroot/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi
rename to buildroot/board/allwinner/suniv-f1c100s/devicetree/linux/suniv-f1c100s.dtsi
diff --git a/software/board/allwinner/suniv-f1c100s/devicetree/uboot/suniv-f1c100s.dtsi b/buildroot/board/allwinner/suniv-f1c100s/devicetree/uboot/suniv-f1c100s.dtsi
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/devicetree/uboot/suniv-f1c100s.dtsi
rename to buildroot/board/allwinner/suniv-f1c100s/devicetree/uboot/suniv-f1c100s.dtsi
diff --git a/software/board/allwinner/suniv-f1c100s/linux.defconfig b/buildroot/board/allwinner/suniv-f1c100s/linux.defconfig
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/linux.defconfig
rename to buildroot/board/allwinner/suniv-f1c100s/linux.defconfig
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0001-Add-USB-Support.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0001-Add-USB-Support.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0001-Add-USB-Support.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0001-Add-USB-Support.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0002-Fix-CCU-definition.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0002-Fix-CCU-definition.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0002-Fix-CCU-definition.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0002-Fix-CCU-definition.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0003-Add-DMA-Controller.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0003-Add-DMA-Controller.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0003-Add-DMA-Controller.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0003-Add-DMA-Controller.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0004-Add-Audio-Codec.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0004-Add-Audio-Codec.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0004-Add-Audio-Codec.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0004-Add-Audio-Codec.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0005-Add-sun4i-csi-packed-format.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0005-Add-sun4i-csi-packed-format.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0005-Add-sun4i-csi-packed-format.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0005-Add-sun4i-csi-packed-format.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0006-Add-rfkill-gpio-DT-support.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0006-Add-rfkill-gpio-DT-support.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0006-Add-rfkill-gpio-DT-support.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0006-Add-rfkill-gpio-DT-support.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0007-Fix-spi-nand-BBM-size.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0007-Fix-spi-nand-BBM-size.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0007-Fix-spi-nand-BBM-size.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0007-Fix-spi-nand-BBM-size.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0008-Add-CedarX-Driver.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0008-Add-CedarX-Driver.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0008-Add-CedarX-Driver.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0008-Add-CedarX-Driver.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0009-Fix-ancient-GDF5-A-series-NAND.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0009-Fix-ancient-GDF5-A-series-NAND.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0009-Fix-ancient-GDF5-A-series-NAND.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0009-Fix-ancient-GDF5-A-series-NAND.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0010-Add-AW9523B-GPIO-Expender.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0010-Add-AW9523B-GPIO-Expender.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0010-Add-AW9523B-GPIO-Expender.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0010-Add-AW9523B-GPIO-Expender.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0011-Allow-phy-sun4i-usb-use-nested-irq.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0011-Allow-phy-sun4i-usb-use-nested-irq.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0011-Allow-phy-sun4i-usb-use-nested-irq.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0011-Allow-phy-sun4i-usb-use-nested-irq.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0012-Add-AXP199-Support.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0012-Add-AXP199-Support.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0012-Add-AXP199-Support.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0012-Add-AXP199-Support.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0013-Add-XT25F128-SPI-NOR.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0013-Add-XT25F128-SPI-NOR.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0013-Add-XT25F128-SPI-NOR.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0013-Add-XT25F128-SPI-NOR.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0014-Add-GD5F1GQ5UExxG-SPI-NAND.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0014-Add-GD5F1GQ5UExxG-SPI-NAND.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0014-Add-GD5F1GQ5UExxG-SPI-NAND.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0014-Add-GD5F1GQ5UExxG-SPI-NAND.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0015-Workaround-for-old-W25N01G.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0015-Workaround-for-old-W25N01G.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0015-Workaround-for-old-W25N01G.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0015-Workaround-for-old-W25N01G.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/linux/0016-Add-onchip_ecc_quirk-switch-for-spi-nand.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/linux/0016-Add-onchip_ecc_quirk-switch-for-spi-nand.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/linux/0016-Add-onchip_ecc_quirk-switch-for-spi-nand.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/linux/0016-Add-onchip_ecc_quirk-switch-for-spi-nand.patch
diff --git a/software/board/allwinner/suniv-f1c100s/patch/u-boot/0001-v2020.07.11.patch b/buildroot/board/allwinner/suniv-f1c100s/patch/u-boot/0001-v2020.07.11.patch
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/patch/u-boot/0001-v2020.07.11.patch
rename to buildroot/board/allwinner/suniv-f1c100s/patch/u-boot/0001-v2020.07.11.patch
diff --git a/software/board/allwinner/suniv-f1c100s/rootfs/usr/sbin/mtd b/buildroot/board/allwinner/suniv-f1c100s/rootfs/usr/sbin/mtd
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/rootfs/usr/sbin/mtd
rename to buildroot/board/allwinner/suniv-f1c100s/rootfs/usr/sbin/mtd
diff --git a/software/board/allwinner/suniv-f1c100s/uboot.defconfig b/buildroot/board/allwinner/suniv-f1c100s/uboot.defconfig
similarity index 100%
rename from software/board/allwinner/suniv-f1c100s/uboot.defconfig
rename to buildroot/board/allwinner/suniv-f1c100s/uboot.defconfig
diff --git a/software/boot/Config.in b/buildroot/boot/Config.in
similarity index 100%
rename from software/boot/Config.in
rename to buildroot/boot/Config.in
diff --git a/software/boot/afboot-stm32/Config.in b/buildroot/boot/afboot-stm32/Config.in
similarity index 100%
rename from software/boot/afboot-stm32/Config.in
rename to buildroot/boot/afboot-stm32/Config.in
diff --git a/software/boot/afboot-stm32/afboot-stm32.hash b/buildroot/boot/afboot-stm32/afboot-stm32.hash
similarity index 100%
rename from software/boot/afboot-stm32/afboot-stm32.hash
rename to buildroot/boot/afboot-stm32/afboot-stm32.hash
diff --git a/software/boot/afboot-stm32/afboot-stm32.mk b/buildroot/boot/afboot-stm32/afboot-stm32.mk
similarity index 100%
rename from software/boot/afboot-stm32/afboot-stm32.mk
rename to buildroot/boot/afboot-stm32/afboot-stm32.mk
diff --git a/software/boot/arm-trusted-firmware/Config.in b/buildroot/boot/arm-trusted-firmware/Config.in
similarity index 100%
rename from software/boot/arm-trusted-firmware/Config.in
rename to buildroot/boot/arm-trusted-firmware/Config.in
diff --git a/software/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
similarity index 100%
rename from software/boot/arm-trusted-firmware/arm-trusted-firmware.hash
rename to buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
diff --git a/software/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
similarity index 100%
rename from software/boot/arm-trusted-firmware/arm-trusted-firmware.mk
rename to buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
diff --git a/software/boot/at91bootstrap/Config.in b/buildroot/boot/at91bootstrap/Config.in
similarity index 100%
rename from software/boot/at91bootstrap/Config.in
rename to buildroot/boot/at91bootstrap/Config.in
diff --git a/software/boot/at91bootstrap/at91bootstrap-1.16-eabi-fix.patch b/buildroot/boot/at91bootstrap/at91bootstrap-1.16-eabi-fix.patch
similarity index 100%
rename from software/boot/at91bootstrap/at91bootstrap-1.16-eabi-fix.patch
rename to buildroot/boot/at91bootstrap/at91bootstrap-1.16-eabi-fix.patch
diff --git a/software/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch b/buildroot/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch
similarity index 100%
rename from software/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch
rename to buildroot/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch
diff --git a/software/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch b/buildroot/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
similarity index 100%
rename from software/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
rename to buildroot/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch
diff --git a/software/boot/at91bootstrap/at91bootstrap.hash b/buildroot/boot/at91bootstrap/at91bootstrap.hash
similarity index 100%
rename from software/boot/at91bootstrap/at91bootstrap.hash
rename to buildroot/boot/at91bootstrap/at91bootstrap.hash
diff --git a/software/boot/at91bootstrap/at91bootstrap.mk b/buildroot/boot/at91bootstrap/at91bootstrap.mk
similarity index 100%
rename from software/boot/at91bootstrap/at91bootstrap.mk
rename to buildroot/boot/at91bootstrap/at91bootstrap.mk
diff --git a/software/boot/at91bootstrap3/Config.in b/buildroot/boot/at91bootstrap3/Config.in
similarity index 100%
rename from software/boot/at91bootstrap3/Config.in
rename to buildroot/boot/at91bootstrap3/Config.in
diff --git a/software/boot/at91bootstrap3/at91bootstrap3.hash b/buildroot/boot/at91bootstrap3/at91bootstrap3.hash
similarity index 100%
rename from software/boot/at91bootstrap3/at91bootstrap3.hash
rename to buildroot/boot/at91bootstrap3/at91bootstrap3.hash
diff --git a/software/boot/at91bootstrap3/at91bootstrap3.mk b/buildroot/boot/at91bootstrap3/at91bootstrap3.mk
similarity index 100%
rename from software/boot/at91bootstrap3/at91bootstrap3.mk
rename to buildroot/boot/at91bootstrap3/at91bootstrap3.mk
diff --git a/software/boot/at91dataflashboot/Config.in b/buildroot/boot/at91dataflashboot/Config.in
similarity index 100%
rename from software/boot/at91dataflashboot/Config.in
rename to buildroot/boot/at91dataflashboot/Config.in
diff --git a/software/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch b/buildroot/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch
similarity index 100%
rename from software/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch
rename to buildroot/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch
diff --git a/software/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch b/buildroot/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch
similarity index 100%
rename from software/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch
rename to buildroot/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch
diff --git a/software/boot/at91dataflashboot/at91dataflashboot.hash b/buildroot/boot/at91dataflashboot/at91dataflashboot.hash
similarity index 100%
rename from software/boot/at91dataflashboot/at91dataflashboot.hash
rename to buildroot/boot/at91dataflashboot/at91dataflashboot.hash
diff --git a/software/boot/at91dataflashboot/at91dataflashboot.mk b/buildroot/boot/at91dataflashboot/at91dataflashboot.mk
similarity index 100%
rename from software/boot/at91dataflashboot/at91dataflashboot.mk
rename to buildroot/boot/at91dataflashboot/at91dataflashboot.mk
diff --git a/software/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in
similarity index 100%
rename from software/boot/barebox/Config.in
rename to buildroot/boot/barebox/Config.in
diff --git a/software/boot/barebox/barebox-aux/Config.in b/buildroot/boot/barebox/barebox-aux/Config.in
similarity index 100%
rename from software/boot/barebox/barebox-aux/Config.in
rename to buildroot/boot/barebox/barebox-aux/Config.in
diff --git a/software/boot/barebox/barebox-aux/barebox-aux.hash b/buildroot/boot/barebox/barebox-aux/barebox-aux.hash
similarity index 100%
rename from software/boot/barebox/barebox-aux/barebox-aux.hash
rename to buildroot/boot/barebox/barebox-aux/barebox-aux.hash
diff --git a/software/boot/barebox/barebox-aux/barebox-aux.mk b/buildroot/boot/barebox/barebox-aux/barebox-aux.mk
similarity index 100%
rename from software/boot/barebox/barebox-aux/barebox-aux.mk
rename to buildroot/boot/barebox/barebox-aux/barebox-aux.mk
diff --git a/software/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash
similarity index 100%
rename from software/boot/barebox/barebox.hash
rename to buildroot/boot/barebox/barebox.hash
diff --git a/software/boot/barebox/barebox.mk b/buildroot/boot/barebox/barebox.mk
similarity index 100%
rename from software/boot/barebox/barebox.mk
rename to buildroot/boot/barebox/barebox.mk
diff --git a/software/boot/barebox/barebox/Config.in b/buildroot/boot/barebox/barebox/Config.in
similarity index 100%
rename from software/boot/barebox/barebox/Config.in
rename to buildroot/boot/barebox/barebox/Config.in
diff --git a/software/boot/barebox/barebox/barebox.hash b/buildroot/boot/barebox/barebox/barebox.hash
similarity index 100%
rename from software/boot/barebox/barebox/barebox.hash
rename to buildroot/boot/barebox/barebox/barebox.hash
diff --git a/software/boot/barebox/barebox/barebox.mk b/buildroot/boot/barebox/barebox/barebox.mk
similarity index 100%
rename from software/boot/barebox/barebox/barebox.mk
rename to buildroot/boot/barebox/barebox/barebox.mk
diff --git a/software/boot/binaries-marvell/Config.in b/buildroot/boot/binaries-marvell/Config.in
similarity index 100%
rename from software/boot/binaries-marvell/Config.in
rename to buildroot/boot/binaries-marvell/Config.in
diff --git a/software/boot/binaries-marvell/binaries-marvell.hash b/buildroot/boot/binaries-marvell/binaries-marvell.hash
similarity index 100%
rename from software/boot/binaries-marvell/binaries-marvell.hash
rename to buildroot/boot/binaries-marvell/binaries-marvell.hash
diff --git a/software/boot/binaries-marvell/binaries-marvell.mk b/buildroot/boot/binaries-marvell/binaries-marvell.mk
similarity index 100%
rename from software/boot/binaries-marvell/binaries-marvell.mk
rename to buildroot/boot/binaries-marvell/binaries-marvell.mk
diff --git a/software/boot/boot-wrapper-aarch64/Config.in b/buildroot/boot/boot-wrapper-aarch64/Config.in
similarity index 100%
rename from software/boot/boot-wrapper-aarch64/Config.in
rename to buildroot/boot/boot-wrapper-aarch64/Config.in
diff --git a/software/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
similarity index 100%
rename from software/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
rename to buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
diff --git a/software/boot/common.mk b/buildroot/boot/common.mk
similarity index 100%
rename from software/boot/common.mk
rename to buildroot/boot/common.mk
diff --git a/software/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch b/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
similarity index 100%
rename from software/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
rename to buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch
diff --git a/software/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/buildroot/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
similarity index 100%
rename from software/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
rename to buildroot/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
diff --git a/software/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/buildroot/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch
similarity index 100%
rename from software/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch
rename to buildroot/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch
diff --git a/software/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/buildroot/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch
similarity index 100%
rename from software/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch
rename to buildroot/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch
diff --git a/software/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch b/buildroot/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch
similarity index 100%
rename from software/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch
rename to buildroot/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch
diff --git a/software/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/buildroot/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch
similarity index 100%
rename from software/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch
rename to buildroot/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch
diff --git a/software/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/buildroot/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch
similarity index 100%
rename from software/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch
rename to buildroot/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch
diff --git a/software/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch b/buildroot/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch
similarity index 100%
rename from software/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch
rename to buildroot/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch
diff --git a/software/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch b/buildroot/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch
similarity index 100%
rename from software/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch
rename to buildroot/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch
diff --git a/software/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch b/buildroot/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch
similarity index 100%
rename from software/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch
rename to buildroot/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch
diff --git a/software/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch b/buildroot/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch
similarity index 100%
rename from software/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch
rename to buildroot/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch
diff --git a/software/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch b/buildroot/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch
similarity index 100%
rename from software/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch
rename to buildroot/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch
diff --git a/software/boot/grub2/0013-udf-Fix-memory-leak.patch b/buildroot/boot/grub2/0013-udf-Fix-memory-leak.patch
similarity index 100%
rename from software/boot/grub2/0013-udf-Fix-memory-leak.patch
rename to buildroot/boot/grub2/0013-udf-Fix-memory-leak.patch
diff --git a/software/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch b/buildroot/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch
similarity index 100%
rename from software/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch
rename to buildroot/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch
diff --git a/software/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch b/buildroot/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch
similarity index 100%
rename from software/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch
rename to buildroot/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch
diff --git a/software/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/buildroot/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
similarity index 100%
rename from software/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
rename to buildroot/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
diff --git a/software/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/buildroot/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
similarity index 100%
rename from software/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
rename to buildroot/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
diff --git a/software/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch b/buildroot/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch
similarity index 100%
rename from software/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch
rename to buildroot/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch
diff --git a/software/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch b/buildroot/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch
similarity index 100%
rename from software/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch
rename to buildroot/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch
diff --git a/software/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/buildroot/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
similarity index 100%
rename from software/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
rename to buildroot/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
diff --git a/software/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch b/buildroot/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch
similarity index 100%
rename from software/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch
rename to buildroot/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch
diff --git a/software/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch b/buildroot/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch
similarity index 100%
rename from software/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch
rename to buildroot/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch
diff --git a/software/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch b/buildroot/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch
similarity index 100%
rename from software/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch
rename to buildroot/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch
diff --git a/software/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch b/buildroot/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch
similarity index 100%
rename from software/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch
rename to buildroot/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch
diff --git a/software/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch b/buildroot/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch
similarity index 100%
rename from software/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch
rename to buildroot/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch
diff --git a/software/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch b/buildroot/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch
similarity index 100%
rename from software/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch
rename to buildroot/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch
diff --git a/software/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch b/buildroot/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch
similarity index 100%
rename from software/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch
rename to buildroot/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch
diff --git a/software/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/buildroot/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch
similarity index 100%
rename from software/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch
rename to buildroot/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch
diff --git a/software/boot/grub2/Config.in b/buildroot/boot/grub2/Config.in
similarity index 100%
rename from software/boot/grub2/Config.in
rename to buildroot/boot/grub2/Config.in
diff --git a/software/boot/grub2/grub.cfg b/buildroot/boot/grub2/grub.cfg
similarity index 100%
rename from software/boot/grub2/grub.cfg
rename to buildroot/boot/grub2/grub.cfg
diff --git a/software/boot/grub2/grub2.hash b/buildroot/boot/grub2/grub2.hash
similarity index 100%
rename from software/boot/grub2/grub2.hash
rename to buildroot/boot/grub2/grub2.hash
diff --git a/software/boot/grub2/grub2.mk b/buildroot/boot/grub2/grub2.mk
similarity index 100%
rename from software/boot/grub2/grub2.mk
rename to buildroot/boot/grub2/grub2.mk
diff --git a/software/boot/grub2/readme.txt b/buildroot/boot/grub2/readme.txt
similarity index 100%
rename from software/boot/grub2/readme.txt
rename to buildroot/boot/grub2/readme.txt
diff --git a/software/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch
similarity index 100%
rename from software/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch
rename to buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch
diff --git a/software/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch
similarity index 100%
rename from software/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch
rename to buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch
diff --git a/software/boot/gummiboot/Config.in b/buildroot/boot/gummiboot/Config.in
similarity index 100%
rename from software/boot/gummiboot/Config.in
rename to buildroot/boot/gummiboot/Config.in
diff --git a/software/boot/gummiboot/buildroot.conf b/buildroot/boot/gummiboot/buildroot.conf
similarity index 100%
rename from software/boot/gummiboot/buildroot.conf
rename to buildroot/boot/gummiboot/buildroot.conf
diff --git a/software/boot/gummiboot/gummiboot.mk b/buildroot/boot/gummiboot/gummiboot.mk
similarity index 100%
rename from software/boot/gummiboot/gummiboot.mk
rename to buildroot/boot/gummiboot/gummiboot.mk
diff --git a/software/boot/gummiboot/loader.conf b/buildroot/boot/gummiboot/loader.conf
similarity index 100%
rename from software/boot/gummiboot/loader.conf
rename to buildroot/boot/gummiboot/loader.conf
diff --git a/software/boot/lpc32xxcdl/Config.in b/buildroot/boot/lpc32xxcdl/Config.in
similarity index 100%
rename from software/boot/lpc32xxcdl/Config.in
rename to buildroot/boot/lpc32xxcdl/Config.in
diff --git a/software/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch b/buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
similarity index 100%
rename from software/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
rename to buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch
diff --git a/software/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch b/buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
similarity index 100%
rename from software/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
rename to buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch
diff --git a/software/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch b/buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
similarity index 100%
rename from software/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
rename to buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch
diff --git a/software/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch b/buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
similarity index 100%
rename from software/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
rename to buildroot/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch
diff --git a/software/boot/lpc32xxcdl/lpc32xxcdl.mk b/buildroot/boot/lpc32xxcdl/lpc32xxcdl.mk
similarity index 100%
rename from software/boot/lpc32xxcdl/lpc32xxcdl.mk
rename to buildroot/boot/lpc32xxcdl/lpc32xxcdl.mk
diff --git a/software/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch b/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
similarity index 100%
rename from software/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
rename to buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
diff --git a/software/boot/mv-ddr-marvell/Config.in b/buildroot/boot/mv-ddr-marvell/Config.in
similarity index 100%
rename from software/boot/mv-ddr-marvell/Config.in
rename to buildroot/boot/mv-ddr-marvell/Config.in
diff --git a/software/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash
similarity index 100%
rename from software/boot/mv-ddr-marvell/mv-ddr-marvell.hash
rename to buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash
diff --git a/software/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk
similarity index 100%
rename from software/boot/mv-ddr-marvell/mv-ddr-marvell.mk
rename to buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk
diff --git a/software/boot/mxs-bootlets/Config.in b/buildroot/boot/mxs-bootlets/Config.in
similarity index 100%
rename from software/boot/mxs-bootlets/Config.in
rename to buildroot/boot/mxs-bootlets/Config.in
diff --git a/software/boot/mxs-bootlets/barebox_ivt.bd b/buildroot/boot/mxs-bootlets/barebox_ivt.bd
similarity index 100%
rename from software/boot/mxs-bootlets/barebox_ivt.bd
rename to buildroot/boot/mxs-bootlets/barebox_ivt.bd
diff --git a/software/boot/mxs-bootlets/mxs-bootlets.hash b/buildroot/boot/mxs-bootlets/mxs-bootlets.hash
similarity index 100%
rename from software/boot/mxs-bootlets/mxs-bootlets.hash
rename to buildroot/boot/mxs-bootlets/mxs-bootlets.hash
diff --git a/software/boot/mxs-bootlets/mxs-bootlets.mk b/buildroot/boot/mxs-bootlets/mxs-bootlets.mk
similarity index 100%
rename from software/boot/mxs-bootlets/mxs-bootlets.mk
rename to buildroot/boot/mxs-bootlets/mxs-bootlets.mk
diff --git a/software/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch b/buildroot/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch
similarity index 100%
rename from software/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch
rename to buildroot/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch
diff --git a/software/boot/opensbi/Config.in b/buildroot/boot/opensbi/Config.in
similarity index 100%
rename from software/boot/opensbi/Config.in
rename to buildroot/boot/opensbi/Config.in
diff --git a/software/boot/opensbi/opensbi.hash b/buildroot/boot/opensbi/opensbi.hash
similarity index 100%
rename from software/boot/opensbi/opensbi.hash
rename to buildroot/boot/opensbi/opensbi.hash
diff --git a/software/boot/opensbi/opensbi.mk b/buildroot/boot/opensbi/opensbi.mk
similarity index 100%
rename from software/boot/opensbi/opensbi.mk
rename to buildroot/boot/opensbi/opensbi.mk
diff --git a/software/boot/optee-os/Config.in b/buildroot/boot/optee-os/Config.in
similarity index 100%
rename from software/boot/optee-os/Config.in
rename to buildroot/boot/optee-os/Config.in
diff --git a/software/boot/optee-os/optee-os.hash b/buildroot/boot/optee-os/optee-os.hash
similarity index 100%
rename from software/boot/optee-os/optee-os.hash
rename to buildroot/boot/optee-os/optee-os.hash
diff --git a/software/boot/optee-os/optee-os.mk b/buildroot/boot/optee-os/optee-os.mk
similarity index 100%
rename from software/boot/optee-os/optee-os.mk
rename to buildroot/boot/optee-os/optee-os.mk
diff --git a/software/boot/s500-bootloader/Config.in b/buildroot/boot/s500-bootloader/Config.in
similarity index 100%
rename from software/boot/s500-bootloader/Config.in
rename to buildroot/boot/s500-bootloader/Config.in
diff --git a/software/boot/s500-bootloader/s500-bootloader.hash b/buildroot/boot/s500-bootloader/s500-bootloader.hash
similarity index 100%
rename from software/boot/s500-bootloader/s500-bootloader.hash
rename to buildroot/boot/s500-bootloader/s500-bootloader.hash
diff --git a/software/boot/s500-bootloader/s500-bootloader.mk b/buildroot/boot/s500-bootloader/s500-bootloader.mk
similarity index 100%
rename from software/boot/s500-bootloader/s500-bootloader.mk
rename to buildroot/boot/s500-bootloader/s500-bootloader.mk
diff --git a/software/boot/shim/Config.in b/buildroot/boot/shim/Config.in
similarity index 100%
rename from software/boot/shim/Config.in
rename to buildroot/boot/shim/Config.in
diff --git a/software/boot/shim/shim.hash b/buildroot/boot/shim/shim.hash
similarity index 100%
rename from software/boot/shim/shim.hash
rename to buildroot/boot/shim/shim.hash
diff --git a/software/boot/shim/shim.mk b/buildroot/boot/shim/shim.mk
similarity index 100%
rename from software/boot/shim/shim.mk
rename to buildroot/boot/shim/shim.mk
diff --git a/software/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch b/buildroot/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
similarity index 100%
rename from software/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
rename to buildroot/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
diff --git a/software/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch b/buildroot/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
similarity index 100%
rename from software/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
rename to buildroot/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
diff --git a/software/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch b/buildroot/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
similarity index 100%
rename from software/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
rename to buildroot/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
diff --git a/software/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch b/buildroot/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
similarity index 100%
rename from software/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
rename to buildroot/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
diff --git a/software/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch b/buildroot/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
similarity index 100%
rename from software/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
rename to buildroot/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
diff --git a/software/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch b/buildroot/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
similarity index 100%
rename from software/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
rename to buildroot/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
diff --git a/software/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch b/buildroot/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
similarity index 100%
rename from software/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
rename to buildroot/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
diff --git a/software/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch b/buildroot/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
similarity index 100%
rename from software/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
rename to buildroot/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
diff --git a/software/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch b/buildroot/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch
similarity index 100%
rename from software/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch
rename to buildroot/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch
diff --git a/software/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch b/buildroot/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch
similarity index 100%
rename from software/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch
rename to buildroot/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch
diff --git a/software/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch b/buildroot/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch
similarity index 100%
rename from software/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch
rename to buildroot/boot/syslinux/0011-extlinux-Use-the-host-toolchain-to-build.patch
diff --git a/software/boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch b/buildroot/boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch
similarity index 100%
rename from software/boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch
rename to buildroot/boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch
diff --git a/software/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch b/buildroot/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch
similarity index 100%
rename from software/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch
rename to buildroot/boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch
diff --git a/software/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch b/buildroot/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch
similarity index 100%
rename from software/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch
rename to buildroot/boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch
diff --git a/software/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch
similarity index 100%
rename from software/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch
rename to buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch
diff --git a/software/boot/syslinux/Config.in b/buildroot/boot/syslinux/Config.in
similarity index 100%
rename from software/boot/syslinux/Config.in
rename to buildroot/boot/syslinux/Config.in
diff --git a/software/boot/syslinux/syslinux.hash b/buildroot/boot/syslinux/syslinux.hash
similarity index 100%
rename from software/boot/syslinux/syslinux.hash
rename to buildroot/boot/syslinux/syslinux.hash
diff --git a/software/boot/syslinux/syslinux.mk b/buildroot/boot/syslinux/syslinux.mk
similarity index 100%
rename from software/boot/syslinux/syslinux.mk
rename to buildroot/boot/syslinux/syslinux.mk
diff --git a/software/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch b/buildroot/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch
similarity index 100%
rename from software/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch
rename to buildroot/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch
diff --git a/software/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch b/buildroot/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch
similarity index 100%
rename from software/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch
rename to buildroot/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch
diff --git a/software/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch b/buildroot/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch
similarity index 100%
rename from software/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch
rename to buildroot/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch
diff --git a/software/boot/uboot/Config.in b/buildroot/boot/uboot/Config.in
similarity index 100%
rename from software/boot/uboot/Config.in
rename to buildroot/boot/uboot/Config.in
diff --git a/software/boot/uboot/uboot.hash b/buildroot/boot/uboot/uboot.hash
similarity index 100%
rename from software/boot/uboot/uboot.hash
rename to buildroot/boot/uboot/uboot.hash
diff --git a/software/boot/uboot/uboot.mk b/buildroot/boot/uboot/uboot.mk
similarity index 100%
rename from software/boot/uboot/uboot.mk
rename to buildroot/boot/uboot/uboot.mk
diff --git a/software/boot/vexpress-firmware/Config.in b/buildroot/boot/vexpress-firmware/Config.in
similarity index 100%
rename from software/boot/vexpress-firmware/Config.in
rename to buildroot/boot/vexpress-firmware/Config.in
diff --git a/software/boot/vexpress-firmware/vexpress-firmware.hash b/buildroot/boot/vexpress-firmware/vexpress-firmware.hash
similarity index 100%
rename from software/boot/vexpress-firmware/vexpress-firmware.hash
rename to buildroot/boot/vexpress-firmware/vexpress-firmware.hash
diff --git a/software/boot/vexpress-firmware/vexpress-firmware.mk b/buildroot/boot/vexpress-firmware/vexpress-firmware.mk
similarity index 100%
rename from software/boot/vexpress-firmware/vexpress-firmware.mk
rename to buildroot/boot/vexpress-firmware/vexpress-firmware.mk
diff --git a/software/configs/YuzukiHD_YuzukiRuler_defconfig b/buildroot/configs/YuzukiHD_YuzukiRuler_defconfig
similarity index 100%
rename from software/configs/YuzukiHD_YuzukiRuler_defconfig
rename to buildroot/configs/YuzukiHD_YuzukiRuler_defconfig
diff --git a/software/docs/conf/asciidoc-text.conf b/buildroot/docs/conf/asciidoc-text.conf
similarity index 100%
rename from software/docs/conf/asciidoc-text.conf
rename to buildroot/docs/conf/asciidoc-text.conf
diff --git a/software/docs/images b/buildroot/docs/images
similarity index 100%
rename from software/docs/images
rename to buildroot/docs/images
diff --git a/software/docs/manual/adding-board-support.txt b/buildroot/docs/manual/adding-board-support.txt
similarity index 100%
rename from software/docs/manual/adding-board-support.txt
rename to buildroot/docs/manual/adding-board-support.txt
diff --git a/software/docs/manual/adding-packages-asciidoc.txt b/buildroot/docs/manual/adding-packages-asciidoc.txt
similarity index 100%
rename from software/docs/manual/adding-packages-asciidoc.txt
rename to buildroot/docs/manual/adding-packages-asciidoc.txt
diff --git a/software/docs/manual/adding-packages-autotools.txt b/buildroot/docs/manual/adding-packages-autotools.txt
similarity index 100%
rename from software/docs/manual/adding-packages-autotools.txt
rename to buildroot/docs/manual/adding-packages-autotools.txt
diff --git a/software/docs/manual/adding-packages-cargo.txt b/buildroot/docs/manual/adding-packages-cargo.txt
similarity index 100%
rename from software/docs/manual/adding-packages-cargo.txt
rename to buildroot/docs/manual/adding-packages-cargo.txt
diff --git a/software/docs/manual/adding-packages-cmake.txt b/buildroot/docs/manual/adding-packages-cmake.txt
similarity index 100%
rename from software/docs/manual/adding-packages-cmake.txt
rename to buildroot/docs/manual/adding-packages-cmake.txt
diff --git a/software/docs/manual/adding-packages-conclusion.txt b/buildroot/docs/manual/adding-packages-conclusion.txt
similarity index 100%
rename from software/docs/manual/adding-packages-conclusion.txt
rename to buildroot/docs/manual/adding-packages-conclusion.txt
diff --git a/software/docs/manual/adding-packages-directory.txt b/buildroot/docs/manual/adding-packages-directory.txt
similarity index 100%
rename from software/docs/manual/adding-packages-directory.txt
rename to buildroot/docs/manual/adding-packages-directory.txt
diff --git a/software/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt
similarity index 100%
rename from software/docs/manual/adding-packages-generic.txt
rename to buildroot/docs/manual/adding-packages-generic.txt
diff --git a/software/docs/manual/adding-packages-gettext.txt b/buildroot/docs/manual/adding-packages-gettext.txt
similarity index 100%
rename from software/docs/manual/adding-packages-gettext.txt
rename to buildroot/docs/manual/adding-packages-gettext.txt
diff --git a/software/docs/manual/adding-packages-golang.txt b/buildroot/docs/manual/adding-packages-golang.txt
similarity index 100%
rename from software/docs/manual/adding-packages-golang.txt
rename to buildroot/docs/manual/adding-packages-golang.txt
diff --git a/software/docs/manual/adding-packages-hooks.txt b/buildroot/docs/manual/adding-packages-hooks.txt
similarity index 100%
rename from software/docs/manual/adding-packages-hooks.txt
rename to buildroot/docs/manual/adding-packages-hooks.txt
diff --git a/software/docs/manual/adding-packages-kconfig.txt b/buildroot/docs/manual/adding-packages-kconfig.txt
similarity index 100%
rename from software/docs/manual/adding-packages-kconfig.txt
rename to buildroot/docs/manual/adding-packages-kconfig.txt
diff --git a/software/docs/manual/adding-packages-kernel-module.txt b/buildroot/docs/manual/adding-packages-kernel-module.txt
similarity index 100%
rename from software/docs/manual/adding-packages-kernel-module.txt
rename to buildroot/docs/manual/adding-packages-kernel-module.txt
diff --git a/software/docs/manual/adding-packages-linux-kernel-spec-infra.txt b/buildroot/docs/manual/adding-packages-linux-kernel-spec-infra.txt
similarity index 100%
rename from software/docs/manual/adding-packages-linux-kernel-spec-infra.txt
rename to buildroot/docs/manual/adding-packages-linux-kernel-spec-infra.txt
diff --git a/software/docs/manual/adding-packages-luarocks.txt b/buildroot/docs/manual/adding-packages-luarocks.txt
similarity index 100%
rename from software/docs/manual/adding-packages-luarocks.txt
rename to buildroot/docs/manual/adding-packages-luarocks.txt
diff --git a/software/docs/manual/adding-packages-meson.txt b/buildroot/docs/manual/adding-packages-meson.txt
similarity index 100%
rename from software/docs/manual/adding-packages-meson.txt
rename to buildroot/docs/manual/adding-packages-meson.txt
diff --git a/software/docs/manual/adding-packages-perl.txt b/buildroot/docs/manual/adding-packages-perl.txt
similarity index 100%
rename from software/docs/manual/adding-packages-perl.txt
rename to buildroot/docs/manual/adding-packages-perl.txt
diff --git a/software/docs/manual/adding-packages-python.txt b/buildroot/docs/manual/adding-packages-python.txt
similarity index 100%
rename from software/docs/manual/adding-packages-python.txt
rename to buildroot/docs/manual/adding-packages-python.txt
diff --git a/software/docs/manual/adding-packages-rebar.txt b/buildroot/docs/manual/adding-packages-rebar.txt
similarity index 100%
rename from software/docs/manual/adding-packages-rebar.txt
rename to buildroot/docs/manual/adding-packages-rebar.txt
diff --git a/software/docs/manual/adding-packages-tips.txt b/buildroot/docs/manual/adding-packages-tips.txt
similarity index 100%
rename from software/docs/manual/adding-packages-tips.txt
rename to buildroot/docs/manual/adding-packages-tips.txt
diff --git a/software/docs/manual/adding-packages-virtual.txt b/buildroot/docs/manual/adding-packages-virtual.txt
similarity index 100%
rename from software/docs/manual/adding-packages-virtual.txt
rename to buildroot/docs/manual/adding-packages-virtual.txt
diff --git a/software/docs/manual/adding-packages-waf.txt b/buildroot/docs/manual/adding-packages-waf.txt
similarity index 100%
rename from software/docs/manual/adding-packages-waf.txt
rename to buildroot/docs/manual/adding-packages-waf.txt
diff --git a/software/docs/manual/adding-packages.txt b/buildroot/docs/manual/adding-packages.txt
similarity index 100%
rename from software/docs/manual/adding-packages.txt
rename to buildroot/docs/manual/adding-packages.txt
diff --git a/software/docs/manual/advanced.txt b/buildroot/docs/manual/advanced.txt
similarity index 100%
rename from software/docs/manual/advanced.txt
rename to buildroot/docs/manual/advanced.txt
diff --git a/software/docs/manual/appendix.txt b/buildroot/docs/manual/appendix.txt
similarity index 100%
rename from software/docs/manual/appendix.txt
rename to buildroot/docs/manual/appendix.txt
diff --git a/software/docs/manual/beyond-buildroot.txt b/buildroot/docs/manual/beyond-buildroot.txt
similarity index 100%
rename from software/docs/manual/beyond-buildroot.txt
rename to buildroot/docs/manual/beyond-buildroot.txt
diff --git a/software/docs/manual/ccache-support.txt b/buildroot/docs/manual/ccache-support.txt
similarity index 100%
rename from software/docs/manual/ccache-support.txt
rename to buildroot/docs/manual/ccache-support.txt
diff --git a/software/docs/manual/common-usage.txt b/buildroot/docs/manual/common-usage.txt
similarity index 100%
rename from software/docs/manual/common-usage.txt
rename to buildroot/docs/manual/common-usage.txt
diff --git a/software/docs/manual/configure-other-components.txt b/buildroot/docs/manual/configure-other-components.txt
similarity index 100%
rename from software/docs/manual/configure-other-components.txt
rename to buildroot/docs/manual/configure-other-components.txt
diff --git a/software/docs/manual/configure.txt b/buildroot/docs/manual/configure.txt
similarity index 100%
rename from software/docs/manual/configure.txt
rename to buildroot/docs/manual/configure.txt
diff --git a/software/docs/manual/contribute.txt b/buildroot/docs/manual/contribute.txt
similarity index 100%
rename from software/docs/manual/contribute.txt
rename to buildroot/docs/manual/contribute.txt
diff --git a/software/docs/manual/customize-configuration.txt b/buildroot/docs/manual/customize-configuration.txt
similarity index 100%
rename from software/docs/manual/customize-configuration.txt
rename to buildroot/docs/manual/customize-configuration.txt
diff --git a/software/docs/manual/customize-device-permission-tables.txt b/buildroot/docs/manual/customize-device-permission-tables.txt
similarity index 100%
rename from software/docs/manual/customize-device-permission-tables.txt
rename to buildroot/docs/manual/customize-device-permission-tables.txt
diff --git a/software/docs/manual/customize-directory-structure.txt b/buildroot/docs/manual/customize-directory-structure.txt
similarity index 100%
rename from software/docs/manual/customize-directory-structure.txt
rename to buildroot/docs/manual/customize-directory-structure.txt
diff --git a/software/docs/manual/customize-outside-br.txt b/buildroot/docs/manual/customize-outside-br.txt
similarity index 100%
rename from software/docs/manual/customize-outside-br.txt
rename to buildroot/docs/manual/customize-outside-br.txt
diff --git a/software/docs/manual/customize-packages.txt b/buildroot/docs/manual/customize-packages.txt
similarity index 100%
rename from software/docs/manual/customize-packages.txt
rename to buildroot/docs/manual/customize-packages.txt
diff --git a/software/docs/manual/customize-patches.txt b/buildroot/docs/manual/customize-patches.txt
similarity index 100%
rename from software/docs/manual/customize-patches.txt
rename to buildroot/docs/manual/customize-patches.txt
diff --git a/software/docs/manual/customize-post-image.txt b/buildroot/docs/manual/customize-post-image.txt
similarity index 100%
rename from software/docs/manual/customize-post-image.txt
rename to buildroot/docs/manual/customize-post-image.txt
diff --git a/software/docs/manual/customize-quick-guide.txt b/buildroot/docs/manual/customize-quick-guide.txt
similarity index 100%
rename from software/docs/manual/customize-quick-guide.txt
rename to buildroot/docs/manual/customize-quick-guide.txt
diff --git a/software/docs/manual/customize-rootfs.txt b/buildroot/docs/manual/customize-rootfs.txt
similarity index 100%
rename from software/docs/manual/customize-rootfs.txt
rename to buildroot/docs/manual/customize-rootfs.txt
diff --git a/software/docs/manual/customize-users-tables.txt b/buildroot/docs/manual/customize-users-tables.txt
similarity index 100%
rename from software/docs/manual/customize-users-tables.txt
rename to buildroot/docs/manual/customize-users-tables.txt
diff --git a/software/docs/manual/customize.txt b/buildroot/docs/manual/customize.txt
similarity index 100%
rename from software/docs/manual/customize.txt
rename to buildroot/docs/manual/customize.txt
diff --git a/software/docs/manual/debugging-buildroot.txt b/buildroot/docs/manual/debugging-buildroot.txt
similarity index 100%
rename from software/docs/manual/debugging-buildroot.txt
rename to buildroot/docs/manual/debugging-buildroot.txt
diff --git a/software/docs/manual/developers.txt b/buildroot/docs/manual/developers.txt
similarity index 100%
rename from software/docs/manual/developers.txt
rename to buildroot/docs/manual/developers.txt
diff --git a/software/docs/manual/docbook-xsl.css b/buildroot/docs/manual/docbook-xsl.css
similarity index 100%
rename from software/docs/manual/docbook-xsl.css
rename to buildroot/docs/manual/docbook-xsl.css
diff --git a/software/docs/manual/download-infra.txt b/buildroot/docs/manual/download-infra.txt
similarity index 100%
rename from software/docs/manual/download-infra.txt
rename to buildroot/docs/manual/download-infra.txt
diff --git a/software/docs/manual/download-location.txt b/buildroot/docs/manual/download-location.txt
similarity index 100%
rename from software/docs/manual/download-location.txt
rename to buildroot/docs/manual/download-location.txt
diff --git a/software/docs/manual/eclipse-integration.txt b/buildroot/docs/manual/eclipse-integration.txt
similarity index 100%
rename from software/docs/manual/eclipse-integration.txt
rename to buildroot/docs/manual/eclipse-integration.txt
diff --git a/software/docs/manual/faq-troubleshooting.txt b/buildroot/docs/manual/faq-troubleshooting.txt
similarity index 100%
rename from software/docs/manual/faq-troubleshooting.txt
rename to buildroot/docs/manual/faq-troubleshooting.txt
diff --git a/software/docs/manual/getting.txt b/buildroot/docs/manual/getting.txt
similarity index 100%
rename from software/docs/manual/getting.txt
rename to buildroot/docs/manual/getting.txt
diff --git a/software/docs/manual/github_hash_mongrel2.png b/buildroot/docs/manual/github_hash_mongrel2.png
similarity index 100%
rename from software/docs/manual/github_hash_mongrel2.png
rename to buildroot/docs/manual/github_hash_mongrel2.png
diff --git a/software/docs/manual/how-buildroot-works.txt b/buildroot/docs/manual/how-buildroot-works.txt
similarity index 100%
rename from software/docs/manual/how-buildroot-works.txt
rename to buildroot/docs/manual/how-buildroot-works.txt
diff --git a/software/docs/manual/introduction.txt b/buildroot/docs/manual/introduction.txt
similarity index 100%
rename from software/docs/manual/introduction.txt
rename to buildroot/docs/manual/introduction.txt
diff --git a/software/docs/manual/known-issues.txt b/buildroot/docs/manual/known-issues.txt
similarity index 100%
rename from software/docs/manual/known-issues.txt
rename to buildroot/docs/manual/known-issues.txt
diff --git a/software/docs/manual/legal-notice.txt b/buildroot/docs/manual/legal-notice.txt
similarity index 100%
rename from software/docs/manual/legal-notice.txt
rename to buildroot/docs/manual/legal-notice.txt
diff --git a/software/docs/manual/logo.png b/buildroot/docs/manual/logo.png
similarity index 100%
rename from software/docs/manual/logo.png
rename to buildroot/docs/manual/logo.png
diff --git a/software/docs/manual/make-tips.txt b/buildroot/docs/manual/make-tips.txt
similarity index 100%
rename from software/docs/manual/make-tips.txt
rename to buildroot/docs/manual/make-tips.txt
diff --git a/software/docs/manual/makedev-syntax.txt b/buildroot/docs/manual/makedev-syntax.txt
similarity index 100%
rename from software/docs/manual/makedev-syntax.txt
rename to buildroot/docs/manual/makedev-syntax.txt
diff --git a/software/docs/manual/makeusers-syntax.txt b/buildroot/docs/manual/makeusers-syntax.txt
similarity index 100%
rename from software/docs/manual/makeusers-syntax.txt
rename to buildroot/docs/manual/makeusers-syntax.txt
diff --git a/software/docs/manual/manual.html b/buildroot/docs/manual/manual.html
similarity index 100%
rename from software/docs/manual/manual.html
rename to buildroot/docs/manual/manual.html
diff --git a/software/docs/manual/manual.mk b/buildroot/docs/manual/manual.mk
similarity index 100%
rename from software/docs/manual/manual.mk
rename to buildroot/docs/manual/manual.mk
diff --git a/software/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf
similarity index 100%
rename from software/docs/manual/manual.pdf
rename to buildroot/docs/manual/manual.pdf
diff --git a/software/docs/manual/manual.text b/buildroot/docs/manual/manual.text
similarity index 100%
rename from software/docs/manual/manual.text
rename to buildroot/docs/manual/manual.text
diff --git a/software/docs/manual/manual.txt b/buildroot/docs/manual/manual.txt
similarity index 100%
rename from software/docs/manual/manual.txt
rename to buildroot/docs/manual/manual.txt
diff --git a/software/docs/manual/migrating.txt b/buildroot/docs/manual/migrating.txt
similarity index 100%
rename from software/docs/manual/migrating.txt
rename to buildroot/docs/manual/migrating.txt
diff --git a/software/docs/manual/package-make-target.txt b/buildroot/docs/manual/package-make-target.txt
similarity index 100%
rename from software/docs/manual/package-make-target.txt
rename to buildroot/docs/manual/package-make-target.txt
diff --git a/software/docs/manual/patch-policy.txt b/buildroot/docs/manual/patch-policy.txt
similarity index 100%
rename from software/docs/manual/patch-policy.txt
rename to buildroot/docs/manual/patch-policy.txt
diff --git a/software/docs/manual/prerequisite.txt b/buildroot/docs/manual/prerequisite.txt
similarity index 100%
rename from software/docs/manual/prerequisite.txt
rename to buildroot/docs/manual/prerequisite.txt
diff --git a/software/docs/manual/quickstart.txt b/buildroot/docs/manual/quickstart.txt
similarity index 100%
rename from software/docs/manual/quickstart.txt
rename to buildroot/docs/manual/quickstart.txt
diff --git a/software/docs/manual/rebuilding-packages.txt b/buildroot/docs/manual/rebuilding-packages.txt
similarity index 100%
rename from software/docs/manual/rebuilding-packages.txt
rename to buildroot/docs/manual/rebuilding-packages.txt
diff --git a/software/docs/manual/release-engineering.txt b/buildroot/docs/manual/release-engineering.txt
similarity index 100%
rename from software/docs/manual/release-engineering.txt
rename to buildroot/docs/manual/release-engineering.txt
diff --git a/software/docs/manual/resources.txt b/buildroot/docs/manual/resources.txt
similarity index 100%
rename from software/docs/manual/resources.txt
rename to buildroot/docs/manual/resources.txt
diff --git a/software/docs/manual/using-buildroot-debugger.txt b/buildroot/docs/manual/using-buildroot-debugger.txt
similarity index 100%
rename from software/docs/manual/using-buildroot-debugger.txt
rename to buildroot/docs/manual/using-buildroot-debugger.txt
diff --git a/software/docs/manual/using-buildroot-development.txt b/buildroot/docs/manual/using-buildroot-development.txt
similarity index 100%
rename from software/docs/manual/using-buildroot-development.txt
rename to buildroot/docs/manual/using-buildroot-development.txt
diff --git a/software/docs/manual/using-buildroot-toolchain.txt b/buildroot/docs/manual/using-buildroot-toolchain.txt
similarity index 100%
rename from software/docs/manual/using-buildroot-toolchain.txt
rename to buildroot/docs/manual/using-buildroot-toolchain.txt
diff --git a/software/docs/manual/writing-rules.txt b/buildroot/docs/manual/writing-rules.txt
similarity index 100%
rename from software/docs/manual/writing-rules.txt
rename to buildroot/docs/manual/writing-rules.txt
diff --git a/software/docs/website/.htaccess b/buildroot/docs/website/.htaccess
similarity index 100%
rename from software/docs/website/.htaccess
rename to buildroot/docs/website/.htaccess
diff --git a/software/docs/website/association.html b/buildroot/docs/website/association.html
similarity index 100%
rename from software/docs/website/association.html
rename to buildroot/docs/website/association.html
diff --git a/software/docs/website/contribute.html b/buildroot/docs/website/contribute.html
similarity index 100%
rename from software/docs/website/contribute.html
rename to buildroot/docs/website/contribute.html
diff --git a/software/docs/website/copyright.txt b/buildroot/docs/website/copyright.txt
similarity index 100%
rename from software/docs/website/copyright.txt
rename to buildroot/docs/website/copyright.txt
diff --git a/software/docs/website/css/main.css b/buildroot/docs/website/css/main.css
similarity index 100%
rename from software/docs/website/css/main.css
rename to buildroot/docs/website/css/main.css
diff --git a/software/docs/website/css/timeline.css b/buildroot/docs/website/css/timeline.css
similarity index 100%
rename from software/docs/website/css/timeline.css
rename to buildroot/docs/website/css/timeline.css
diff --git a/software/docs/website/docs.html b/buildroot/docs/website/docs.html
similarity index 100%
rename from software/docs/website/docs.html
rename to buildroot/docs/website/docs.html
diff --git a/software/docs/website/download.html b/buildroot/docs/website/download.html
similarity index 100%
rename from software/docs/website/download.html
rename to buildroot/docs/website/download.html
diff --git a/software/docs/website/favicon.ico b/buildroot/docs/website/favicon.ico
similarity index 100%
rename from software/docs/website/favicon.ico
rename to buildroot/docs/website/favicon.ico
diff --git a/software/docs/website/favicon.png b/buildroot/docs/website/favicon.png
similarity index 100%
rename from software/docs/website/favicon.png
rename to buildroot/docs/website/favicon.png
diff --git a/software/docs/website/fonts/glyphicons-halflings-regular.woff b/buildroot/docs/website/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from software/docs/website/fonts/glyphicons-halflings-regular.woff
rename to buildroot/docs/website/fonts/glyphicons-halflings-regular.woff
diff --git a/software/docs/website/footer.html b/buildroot/docs/website/footer.html
similarity index 100%
rename from software/docs/website/footer.html
rename to buildroot/docs/website/footer.html
diff --git a/software/docs/website/header.html b/buildroot/docs/website/header.html
similarity index 100%
rename from software/docs/website/header.html
rename to buildroot/docs/website/header.html
diff --git a/software/docs/website/images/amarula-solutions-logo.png b/buildroot/docs/website/images/amarula-solutions-logo.png
similarity index 100%
rename from software/docs/website/images/amarula-solutions-logo.png
rename to buildroot/docs/website/images/amarula-solutions-logo.png
diff --git a/software/docs/website/images/bootlin-logo.png b/buildroot/docs/website/images/bootlin-logo.png
similarity index 100%
rename from software/docs/website/images/bootlin-logo.png
rename to buildroot/docs/website/images/bootlin-logo.png
diff --git a/software/docs/website/images/boundary-devices-logo.png b/buildroot/docs/website/images/boundary-devices-logo.png
similarity index 100%
rename from software/docs/website/images/boundary-devices-logo.png
rename to buildroot/docs/website/images/boundary-devices-logo.png
diff --git a/software/docs/website/images/browser.png b/buildroot/docs/website/images/browser.png
similarity index 100%
rename from software/docs/website/images/browser.png
rename to buildroot/docs/website/images/browser.png
diff --git a/software/docs/website/images/bug-buddy.png b/buildroot/docs/website/images/bug-buddy.png
similarity index 100%
rename from software/docs/website/images/bug-buddy.png
rename to buildroot/docs/website/images/bug-buddy.png
diff --git a/software/docs/website/images/buildroot-slides.png b/buildroot/docs/website/images/buildroot-slides.png
similarity index 100%
rename from software/docs/website/images/buildroot-slides.png
rename to buildroot/docs/website/images/buildroot-slides.png
diff --git a/software/docs/website/images/calao-logo.png b/buildroot/docs/website/images/calao-logo.png
similarity index 100%
rename from software/docs/website/images/calao-logo.png
rename to buildroot/docs/website/images/calao-logo.png
diff --git a/software/docs/website/images/circuitco-logo.png b/buildroot/docs/website/images/circuitco-logo.png
similarity index 100%
rename from software/docs/website/images/circuitco-logo.png
rename to buildroot/docs/website/images/circuitco-logo.png
diff --git a/software/docs/website/images/clippy.svg b/buildroot/docs/website/images/clippy.svg
similarity index 100%
rename from software/docs/website/images/clippy.svg
rename to buildroot/docs/website/images/clippy.svg
diff --git a/software/docs/website/images/email.png b/buildroot/docs/website/images/email.png
similarity index 100%
rename from software/docs/website/images/email.png
rename to buildroot/docs/website/images/email.png
diff --git a/software/docs/website/images/fluendo-logo.png b/buildroot/docs/website/images/fluendo-logo.png
similarity index 100%
rename from software/docs/website/images/fluendo-logo.png
rename to buildroot/docs/website/images/fluendo-logo.png
diff --git a/software/docs/website/images/free-electrons-logo.png b/buildroot/docs/website/images/free-electrons-logo.png
similarity index 100%
rename from software/docs/website/images/free-electrons-logo.png
rename to buildroot/docs/website/images/free-electrons-logo.png
diff --git a/software/docs/website/images/gift.png b/buildroot/docs/website/images/gift.png
similarity index 100%
rename from software/docs/website/images/gift.png
rename to buildroot/docs/website/images/gift.png
diff --git a/software/docs/website/images/github_hash_mongrel2.png b/buildroot/docs/website/images/github_hash_mongrel2.png
similarity index 100%
rename from software/docs/website/images/github_hash_mongrel2.png
rename to buildroot/docs/website/images/github_hash_mongrel2.png
diff --git a/software/docs/website/images/google-logo.png b/buildroot/docs/website/images/google-logo.png
similarity index 100%
rename from software/docs/website/images/google-logo.png
rename to buildroot/docs/website/images/google-logo.png
diff --git a/software/docs/website/images/hammer.png b/buildroot/docs/website/images/hammer.png
similarity index 100%
rename from software/docs/website/images/hammer.png
rename to buildroot/docs/website/images/hammer.png
diff --git a/software/docs/website/images/imgtec-logo.png b/buildroot/docs/website/images/imgtec-logo.png
similarity index 100%
rename from software/docs/website/images/imgtec-logo.png
rename to buildroot/docs/website/images/imgtec-logo.png
diff --git a/software/docs/website/images/irc.png b/buildroot/docs/website/images/irc.png
similarity index 100%
rename from software/docs/website/images/irc.png
rename to buildroot/docs/website/images/irc.png
diff --git a/software/docs/website/images/logilin-logo.png b/buildroot/docs/website/images/logilin-logo.png
similarity index 100%
rename from software/docs/website/images/logilin-logo.png
rename to buildroot/docs/website/images/logilin-logo.png
diff --git a/software/docs/website/images/logo.png b/buildroot/docs/website/images/logo.png
similarity index 100%
rename from software/docs/website/images/logo.png
rename to buildroot/docs/website/images/logo.png
diff --git a/software/docs/website/images/logo.xcf b/buildroot/docs/website/images/logo.xcf
similarity index 100%
rename from software/docs/website/images/logo.xcf
rename to buildroot/docs/website/images/logo.xcf
diff --git a/software/docs/website/images/logo_small.png b/buildroot/docs/website/images/logo_small.png
similarity index 100%
rename from software/docs/website/images/logo_small.png
rename to buildroot/docs/website/images/logo_small.png
diff --git a/software/docs/website/images/menuconfig.png b/buildroot/docs/website/images/menuconfig.png
similarity index 100%
rename from software/docs/website/images/menuconfig.png
rename to buildroot/docs/website/images/menuconfig.png
diff --git a/software/docs/website/images/mind-logo.png b/buildroot/docs/website/images/mind-logo.png
similarity index 100%
rename from software/docs/website/images/mind-logo.png
rename to buildroot/docs/website/images/mind-logo.png
diff --git a/software/docs/website/images/nconfig.png b/buildroot/docs/website/images/nconfig.png
similarity index 100%
rename from software/docs/website/images/nconfig.png
rename to buildroot/docs/website/images/nconfig.png
diff --git a/software/docs/website/images/package.png b/buildroot/docs/website/images/package.png
similarity index 100%
rename from software/docs/website/images/package.png
rename to buildroot/docs/website/images/package.png
diff --git a/software/docs/website/images/pdf-icon.png b/buildroot/docs/website/images/pdf-icon.png
similarity index 100%
rename from software/docs/website/images/pdf-icon.png
rename to buildroot/docs/website/images/pdf-icon.png
diff --git a/software/docs/website/images/rockwell-collins-logo.png b/buildroot/docs/website/images/rockwell-collins-logo.png
similarity index 100%
rename from software/docs/website/images/rockwell-collins-logo.png
rename to buildroot/docs/website/images/rockwell-collins-logo.png
diff --git a/software/docs/website/images/scaleway-logo.png b/buildroot/docs/website/images/scaleway-logo.png
similarity index 100%
rename from software/docs/website/images/scaleway-logo.png
rename to buildroot/docs/website/images/scaleway-logo.png
diff --git a/software/docs/website/images/smile-logo.png b/buildroot/docs/website/images/smile-logo.png
similarity index 100%
rename from software/docs/website/images/smile-logo.png
rename to buildroot/docs/website/images/smile-logo.png
diff --git a/software/docs/website/images/synopsys-logo.png b/buildroot/docs/website/images/synopsys-logo.png
similarity index 100%
rename from software/docs/website/images/synopsys-logo.png
rename to buildroot/docs/website/images/synopsys-logo.png
diff --git a/software/docs/website/images/text.png b/buildroot/docs/website/images/text.png
similarity index 100%
rename from software/docs/website/images/text.png
rename to buildroot/docs/website/images/text.png
diff --git a/software/docs/website/images/tkos-logo.png b/buildroot/docs/website/images/tkos-logo.png
similarity index 100%
rename from software/docs/website/images/tkos-logo.png
rename to buildroot/docs/website/images/tkos-logo.png
diff --git a/software/docs/website/images/tux-flat.png b/buildroot/docs/website/images/tux-flat.png
similarity index 100%
rename from software/docs/website/images/tux-flat.png
rename to buildroot/docs/website/images/tux-flat.png
diff --git a/software/docs/website/images/xconfig.png b/buildroot/docs/website/images/xconfig.png
similarity index 100%
rename from software/docs/website/images/xconfig.png
rename to buildroot/docs/website/images/xconfig.png
diff --git a/software/docs/website/images/zillabit-logo.png b/buildroot/docs/website/images/zillabit-logo.png
similarity index 100%
rename from software/docs/website/images/zillabit-logo.png
rename to buildroot/docs/website/images/zillabit-logo.png
diff --git a/software/docs/website/images/zip.png b/buildroot/docs/website/images/zip.png
similarity index 100%
rename from software/docs/website/images/zip.png
rename to buildroot/docs/website/images/zip.png
diff --git a/software/docs/website/index.html b/buildroot/docs/website/index.html
similarity index 100%
rename from software/docs/website/index.html
rename to buildroot/docs/website/index.html
diff --git a/software/docs/website/js/buildroot.js b/buildroot/docs/website/js/buildroot.js
similarity index 100%
rename from software/docs/website/js/buildroot.js
rename to buildroot/docs/website/js/buildroot.js
diff --git a/software/docs/website/news.html b/buildroot/docs/website/news.html
similarity index 100%
rename from software/docs/website/news.html
rename to buildroot/docs/website/news.html
diff --git a/software/docs/website/robots.txt b/buildroot/docs/website/robots.txt
similarity index 100%
rename from software/docs/website/robots.txt
rename to buildroot/docs/website/robots.txt
diff --git a/software/docs/website/sponsors.html b/buildroot/docs/website/sponsors.html
similarity index 100%
rename from software/docs/website/sponsors.html
rename to buildroot/docs/website/sponsors.html
diff --git a/software/docs/website/support.html b/buildroot/docs/website/support.html
similarity index 100%
rename from software/docs/website/support.html
rename to buildroot/docs/website/support.html
diff --git a/software/fs/Config.in b/buildroot/fs/Config.in
similarity index 100%
rename from software/fs/Config.in
rename to buildroot/fs/Config.in
diff --git a/software/fs/axfs/Config.in b/buildroot/fs/axfs/Config.in
similarity index 100%
rename from software/fs/axfs/Config.in
rename to buildroot/fs/axfs/Config.in
diff --git a/software/fs/axfs/axfs.mk b/buildroot/fs/axfs/axfs.mk
similarity index 100%
rename from software/fs/axfs/axfs.mk
rename to buildroot/fs/axfs/axfs.mk
diff --git a/software/fs/btrfs/Config.in b/buildroot/fs/btrfs/Config.in
similarity index 100%
rename from software/fs/btrfs/Config.in
rename to buildroot/fs/btrfs/Config.in
diff --git a/software/fs/btrfs/btrfs.mk b/buildroot/fs/btrfs/btrfs.mk
similarity index 100%
rename from software/fs/btrfs/btrfs.mk
rename to buildroot/fs/btrfs/btrfs.mk
diff --git a/software/fs/cloop/Config.in b/buildroot/fs/cloop/Config.in
similarity index 100%
rename from software/fs/cloop/Config.in
rename to buildroot/fs/cloop/Config.in
diff --git a/software/fs/cloop/cloop.mk b/buildroot/fs/cloop/cloop.mk
similarity index 100%
rename from software/fs/cloop/cloop.mk
rename to buildroot/fs/cloop/cloop.mk
diff --git a/software/fs/common.mk b/buildroot/fs/common.mk
similarity index 100%
rename from software/fs/common.mk
rename to buildroot/fs/common.mk
diff --git a/software/fs/cpio/Config.in b/buildroot/fs/cpio/Config.in
similarity index 100%
rename from software/fs/cpio/Config.in
rename to buildroot/fs/cpio/Config.in
diff --git a/software/fs/cpio/cpio.mk b/buildroot/fs/cpio/cpio.mk
similarity index 100%
rename from software/fs/cpio/cpio.mk
rename to buildroot/fs/cpio/cpio.mk
diff --git a/software/fs/cpio/init b/buildroot/fs/cpio/init
similarity index 100%
rename from software/fs/cpio/init
rename to buildroot/fs/cpio/init
diff --git a/software/fs/cramfs/Config.in b/buildroot/fs/cramfs/Config.in
similarity index 100%
rename from software/fs/cramfs/Config.in
rename to buildroot/fs/cramfs/Config.in
diff --git a/software/fs/cramfs/cramfs.mk b/buildroot/fs/cramfs/cramfs.mk
similarity index 100%
rename from software/fs/cramfs/cramfs.mk
rename to buildroot/fs/cramfs/cramfs.mk
diff --git a/software/fs/ext2/Config.in b/buildroot/fs/ext2/Config.in
similarity index 100%
rename from software/fs/ext2/Config.in
rename to buildroot/fs/ext2/Config.in
diff --git a/software/fs/ext2/ext2.mk b/buildroot/fs/ext2/ext2.mk
similarity index 100%
rename from software/fs/ext2/ext2.mk
rename to buildroot/fs/ext2/ext2.mk
diff --git a/software/fs/f2fs/Config.in b/buildroot/fs/f2fs/Config.in
similarity index 100%
rename from software/fs/f2fs/Config.in
rename to buildroot/fs/f2fs/Config.in
diff --git a/software/fs/f2fs/f2fs.mk b/buildroot/fs/f2fs/f2fs.mk
similarity index 100%
rename from software/fs/f2fs/f2fs.mk
rename to buildroot/fs/f2fs/f2fs.mk
diff --git a/software/fs/initramfs/Config.in b/buildroot/fs/initramfs/Config.in
similarity index 100%
rename from software/fs/initramfs/Config.in
rename to buildroot/fs/initramfs/Config.in
diff --git a/software/fs/initramfs/initramfs.mk b/buildroot/fs/initramfs/initramfs.mk
similarity index 100%
rename from software/fs/initramfs/initramfs.mk
rename to buildroot/fs/initramfs/initramfs.mk
diff --git a/software/fs/iso9660/Config.in b/buildroot/fs/iso9660/Config.in
similarity index 100%
rename from software/fs/iso9660/Config.in
rename to buildroot/fs/iso9660/Config.in
diff --git a/software/fs/iso9660/grub.cfg b/buildroot/fs/iso9660/grub.cfg
similarity index 100%
rename from software/fs/iso9660/grub.cfg
rename to buildroot/fs/iso9660/grub.cfg
diff --git a/software/fs/iso9660/iso9660.mk b/buildroot/fs/iso9660/iso9660.mk
similarity index 100%
rename from software/fs/iso9660/iso9660.mk
rename to buildroot/fs/iso9660/iso9660.mk
diff --git a/software/fs/iso9660/isolinux.cfg b/buildroot/fs/iso9660/isolinux.cfg
similarity index 100%
rename from software/fs/iso9660/isolinux.cfg
rename to buildroot/fs/iso9660/isolinux.cfg
diff --git a/software/fs/jffs2/Config.in b/buildroot/fs/jffs2/Config.in
similarity index 100%
rename from software/fs/jffs2/Config.in
rename to buildroot/fs/jffs2/Config.in
diff --git a/software/fs/jffs2/jffs2.mk b/buildroot/fs/jffs2/jffs2.mk
similarity index 100%
rename from software/fs/jffs2/jffs2.mk
rename to buildroot/fs/jffs2/jffs2.mk
diff --git a/software/fs/romfs/Config.in b/buildroot/fs/romfs/Config.in
similarity index 100%
rename from software/fs/romfs/Config.in
rename to buildroot/fs/romfs/Config.in
diff --git a/software/fs/romfs/romfs.mk b/buildroot/fs/romfs/romfs.mk
similarity index 100%
rename from software/fs/romfs/romfs.mk
rename to buildroot/fs/romfs/romfs.mk
diff --git a/software/fs/squashfs/Config.in b/buildroot/fs/squashfs/Config.in
similarity index 100%
rename from software/fs/squashfs/Config.in
rename to buildroot/fs/squashfs/Config.in
diff --git a/software/fs/squashfs/squashfs.mk b/buildroot/fs/squashfs/squashfs.mk
similarity index 100%
rename from software/fs/squashfs/squashfs.mk
rename to buildroot/fs/squashfs/squashfs.mk
diff --git a/software/fs/tar/Config.in b/buildroot/fs/tar/Config.in
similarity index 100%
rename from software/fs/tar/Config.in
rename to buildroot/fs/tar/Config.in
diff --git a/software/fs/tar/tar.mk b/buildroot/fs/tar/tar.mk
similarity index 100%
rename from software/fs/tar/tar.mk
rename to buildroot/fs/tar/tar.mk
diff --git a/software/fs/ubi/Config.in b/buildroot/fs/ubi/Config.in
similarity index 100%
rename from software/fs/ubi/Config.in
rename to buildroot/fs/ubi/Config.in
diff --git a/software/fs/ubi/ubi.mk b/buildroot/fs/ubi/ubi.mk
similarity index 100%
rename from software/fs/ubi/ubi.mk
rename to buildroot/fs/ubi/ubi.mk
diff --git a/software/fs/ubi/ubinize.cfg b/buildroot/fs/ubi/ubinize.cfg
similarity index 100%
rename from software/fs/ubi/ubinize.cfg
rename to buildroot/fs/ubi/ubinize.cfg
diff --git a/software/fs/ubifs/Config.in b/buildroot/fs/ubifs/Config.in
similarity index 100%
rename from software/fs/ubifs/Config.in
rename to buildroot/fs/ubifs/Config.in
diff --git a/software/fs/ubifs/ubifs.mk b/buildroot/fs/ubifs/ubifs.mk
similarity index 100%
rename from software/fs/ubifs/ubifs.mk
rename to buildroot/fs/ubifs/ubifs.mk
diff --git a/software/fs/yaffs2/Config.in b/buildroot/fs/yaffs2/Config.in
similarity index 100%
rename from software/fs/yaffs2/Config.in
rename to buildroot/fs/yaffs2/Config.in
diff --git a/software/fs/yaffs2/yaffs2.mk b/buildroot/fs/yaffs2/yaffs2.mk
similarity index 100%
rename from software/fs/yaffs2/yaffs2.mk
rename to buildroot/fs/yaffs2/yaffs2.mk
diff --git a/software/linux/0001-timeconst.pl-Eliminate-Perl-warning.patch.conditional b/buildroot/linux/0001-timeconst.pl-Eliminate-Perl-warning.patch.conditional
similarity index 100%
rename from software/linux/0001-timeconst.pl-Eliminate-Perl-warning.patch.conditional
rename to buildroot/linux/0001-timeconst.pl-Eliminate-Perl-warning.patch.conditional
diff --git a/software/linux/Config.ext.in b/buildroot/linux/Config.ext.in
similarity index 100%
rename from software/linux/Config.ext.in
rename to buildroot/linux/Config.ext.in
diff --git a/software/linux/Config.in b/buildroot/linux/Config.in
similarity index 100%
rename from software/linux/Config.in
rename to buildroot/linux/Config.in
diff --git a/software/linux/linux-ext-aufs.mk b/buildroot/linux/linux-ext-aufs.mk
similarity index 100%
rename from software/linux/linux-ext-aufs.mk
rename to buildroot/linux/linux-ext-aufs.mk
diff --git a/software/linux/linux-ext-ev3dev-linux-drivers.mk b/buildroot/linux/linux-ext-ev3dev-linux-drivers.mk
similarity index 100%
rename from software/linux/linux-ext-ev3dev-linux-drivers.mk
rename to buildroot/linux/linux-ext-ev3dev-linux-drivers.mk
diff --git a/software/linux/linux-ext-fbtft.mk b/buildroot/linux/linux-ext-fbtft.mk
similarity index 100%
rename from software/linux/linux-ext-fbtft.mk
rename to buildroot/linux/linux-ext-fbtft.mk
diff --git a/software/linux/linux-ext-rtai.mk b/buildroot/linux/linux-ext-rtai.mk
similarity index 100%
rename from software/linux/linux-ext-rtai.mk
rename to buildroot/linux/linux-ext-rtai.mk
diff --git a/software/linux/linux-ext-xenomai.mk b/buildroot/linux/linux-ext-xenomai.mk
similarity index 100%
rename from software/linux/linux-ext-xenomai.mk
rename to buildroot/linux/linux-ext-xenomai.mk
diff --git a/software/linux/linux.hash b/buildroot/linux/linux.hash
similarity index 100%
rename from software/linux/linux.hash
rename to buildroot/linux/linux.hash
diff --git a/software/linux/linux.mk b/buildroot/linux/linux.mk
similarity index 100%
rename from software/linux/linux.mk
rename to buildroot/linux/linux.mk
diff --git a/software/package/18xx-ti-utils/18xx-ti-utils.hash b/buildroot/package/18xx-ti-utils/18xx-ti-utils.hash
similarity index 100%
rename from software/package/18xx-ti-utils/18xx-ti-utils.hash
rename to buildroot/package/18xx-ti-utils/18xx-ti-utils.hash
diff --git a/software/package/18xx-ti-utils/18xx-ti-utils.mk b/buildroot/package/18xx-ti-utils/18xx-ti-utils.mk
similarity index 100%
rename from software/package/18xx-ti-utils/18xx-ti-utils.mk
rename to buildroot/package/18xx-ti-utils/18xx-ti-utils.mk
diff --git a/software/package/18xx-ti-utils/Config.in b/buildroot/package/18xx-ti-utils/Config.in
similarity index 100%
rename from software/package/18xx-ti-utils/Config.in
rename to buildroot/package/18xx-ti-utils/Config.in
diff --git a/software/package/4th/0001-avoid-regen-during-install.patch b/buildroot/package/4th/0001-avoid-regen-during-install.patch
similarity index 100%
rename from software/package/4th/0001-avoid-regen-during-install.patch
rename to buildroot/package/4th/0001-avoid-regen-during-install.patch
diff --git a/software/package/4th/4th.hash b/buildroot/package/4th/4th.hash
similarity index 100%
rename from software/package/4th/4th.hash
rename to buildroot/package/4th/4th.hash
diff --git a/software/package/4th/4th.mk b/buildroot/package/4th/4th.mk
similarity index 100%
rename from software/package/4th/4th.mk
rename to buildroot/package/4th/4th.mk
diff --git a/software/package/4th/Config.in b/buildroot/package/4th/Config.in
similarity index 100%
rename from software/package/4th/Config.in
rename to buildroot/package/4th/Config.in
diff --git a/software/package/Config.in b/buildroot/package/Config.in
similarity index 100%
rename from software/package/Config.in
rename to buildroot/package/Config.in
diff --git a/software/package/Config.in.host b/buildroot/package/Config.in.host
similarity index 100%
rename from software/package/Config.in.host
rename to buildroot/package/Config.in.host
diff --git a/software/package/Makefile.in b/buildroot/package/Makefile.in
similarity index 100%
rename from software/package/Makefile.in
rename to buildroot/package/Makefile.in
diff --git a/software/package/a10disp/Config.in b/buildroot/package/a10disp/Config.in
similarity index 100%
rename from software/package/a10disp/Config.in
rename to buildroot/package/a10disp/Config.in
diff --git a/software/package/a10disp/a10disp.hash b/buildroot/package/a10disp/a10disp.hash
similarity index 100%
rename from software/package/a10disp/a10disp.hash
rename to buildroot/package/a10disp/a10disp.hash
diff --git a/software/package/a10disp/a10disp.mk b/buildroot/package/a10disp/a10disp.mk
similarity index 100%
rename from software/package/a10disp/a10disp.mk
rename to buildroot/package/a10disp/a10disp.mk
diff --git a/software/package/abootimg/Config.in b/buildroot/package/abootimg/Config.in
similarity index 100%
rename from software/package/abootimg/Config.in
rename to buildroot/package/abootimg/Config.in
diff --git a/software/package/abootimg/abootimg.hash b/buildroot/package/abootimg/abootimg.hash
similarity index 100%
rename from software/package/abootimg/abootimg.hash
rename to buildroot/package/abootimg/abootimg.hash
diff --git a/software/package/abootimg/abootimg.mk b/buildroot/package/abootimg/abootimg.mk
similarity index 100%
rename from software/package/abootimg/abootimg.mk
rename to buildroot/package/abootimg/abootimg.mk
diff --git a/software/package/acl/0001-Build-with-old-GCC-versions.patch b/buildroot/package/acl/0001-Build-with-old-GCC-versions.patch
similarity index 100%
rename from software/package/acl/0001-Build-with-old-GCC-versions.patch
rename to buildroot/package/acl/0001-Build-with-old-GCC-versions.patch
diff --git a/software/package/acl/Config.in b/buildroot/package/acl/Config.in
similarity index 100%
rename from software/package/acl/Config.in
rename to buildroot/package/acl/Config.in
diff --git a/software/package/acl/acl.hash b/buildroot/package/acl/acl.hash
similarity index 100%
rename from software/package/acl/acl.hash
rename to buildroot/package/acl/acl.hash
diff --git a/software/package/acl/acl.mk b/buildroot/package/acl/acl.mk
similarity index 100%
rename from software/package/acl/acl.mk
rename to buildroot/package/acl/acl.mk
diff --git a/software/package/acpica/0001-build-do-not-use-Werror.patch b/buildroot/package/acpica/0001-build-do-not-use-Werror.patch
similarity index 100%
rename from software/package/acpica/0001-build-do-not-use-Werror.patch
rename to buildroot/package/acpica/0001-build-do-not-use-Werror.patch
diff --git a/software/package/acpica/Config.in b/buildroot/package/acpica/Config.in
similarity index 100%
rename from software/package/acpica/Config.in
rename to buildroot/package/acpica/Config.in
diff --git a/software/package/acpica/acpica.hash b/buildroot/package/acpica/acpica.hash
similarity index 100%
rename from software/package/acpica/acpica.hash
rename to buildroot/package/acpica/acpica.hash
diff --git a/software/package/acpica/acpica.mk b/buildroot/package/acpica/acpica.mk
similarity index 100%
rename from software/package/acpica/acpica.mk
rename to buildroot/package/acpica/acpica.mk
diff --git a/software/package/acpid/0001-dont-use-isfdtype.patch b/buildroot/package/acpid/0001-dont-use-isfdtype.patch
similarity index 100%
rename from software/package/acpid/0001-dont-use-isfdtype.patch
rename to buildroot/package/acpid/0001-dont-use-isfdtype.patch
diff --git a/software/package/acpid/0002-add-missing-defines.patch b/buildroot/package/acpid/0002-add-missing-defines.patch
similarity index 100%
rename from software/package/acpid/0002-add-missing-defines.patch
rename to buildroot/package/acpid/0002-add-missing-defines.patch
diff --git a/software/package/acpid/Config.in b/buildroot/package/acpid/Config.in
similarity index 100%
rename from software/package/acpid/Config.in
rename to buildroot/package/acpid/Config.in
diff --git a/software/package/acpid/S02acpid b/buildroot/package/acpid/S02acpid
similarity index 100%
rename from software/package/acpid/S02acpid
rename to buildroot/package/acpid/S02acpid
diff --git a/software/package/acpid/acpid.hash b/buildroot/package/acpid/acpid.hash
similarity index 100%
rename from software/package/acpid/acpid.hash
rename to buildroot/package/acpid/acpid.hash
diff --git a/software/package/acpid/acpid.mk b/buildroot/package/acpid/acpid.mk
similarity index 100%
rename from software/package/acpid/acpid.mk
rename to buildroot/package/acpid/acpid.mk
diff --git a/software/package/acpid/acpid.service b/buildroot/package/acpid/acpid.service
similarity index 100%
rename from software/package/acpid/acpid.service
rename to buildroot/package/acpid/acpid.service
diff --git a/software/package/acpitool/Config.in b/buildroot/package/acpitool/Config.in
similarity index 100%
rename from software/package/acpitool/Config.in
rename to buildroot/package/acpitool/Config.in
diff --git a/software/package/acpitool/acpitool.hash b/buildroot/package/acpitool/acpitool.hash
similarity index 100%
rename from software/package/acpitool/acpitool.hash
rename to buildroot/package/acpitool/acpitool.hash
diff --git a/software/package/acpitool/acpitool.mk b/buildroot/package/acpitool/acpitool.mk
similarity index 100%
rename from software/package/acpitool/acpitool.mk
rename to buildroot/package/acpitool/acpitool.mk
diff --git a/software/package/acsccid/Config.in b/buildroot/package/acsccid/Config.in
similarity index 100%
rename from software/package/acsccid/Config.in
rename to buildroot/package/acsccid/Config.in
diff --git a/software/package/acsccid/acsccid.hash b/buildroot/package/acsccid/acsccid.hash
similarity index 100%
rename from software/package/acsccid/acsccid.hash
rename to buildroot/package/acsccid/acsccid.hash
diff --git a/software/package/acsccid/acsccid.mk b/buildroot/package/acsccid/acsccid.mk
similarity index 100%
rename from software/package/acsccid/acsccid.mk
rename to buildroot/package/acsccid/acsccid.mk
diff --git a/software/package/adwaita-icon-theme/Config.in b/buildroot/package/adwaita-icon-theme/Config.in
similarity index 100%
rename from software/package/adwaita-icon-theme/Config.in
rename to buildroot/package/adwaita-icon-theme/Config.in
diff --git a/software/package/adwaita-icon-theme/adwaita-icon-theme.hash b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash
similarity index 100%
rename from software/package/adwaita-icon-theme/adwaita-icon-theme.hash
rename to buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash
diff --git a/software/package/adwaita-icon-theme/adwaita-icon-theme.mk b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk
similarity index 100%
rename from software/package/adwaita-icon-theme/adwaita-icon-theme.mk
rename to buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk
diff --git a/software/package/aer-inject/Config.in b/buildroot/package/aer-inject/Config.in
similarity index 100%
rename from software/package/aer-inject/Config.in
rename to buildroot/package/aer-inject/Config.in
diff --git a/software/package/aer-inject/aer-inject.hash b/buildroot/package/aer-inject/aer-inject.hash
similarity index 100%
rename from software/package/aer-inject/aer-inject.hash
rename to buildroot/package/aer-inject/aer-inject.hash
diff --git a/software/package/aer-inject/aer-inject.mk b/buildroot/package/aer-inject/aer-inject.mk
similarity index 100%
rename from software/package/aer-inject/aer-inject.mk
rename to buildroot/package/aer-inject/aer-inject.mk
diff --git a/software/package/aespipe/Config.in b/buildroot/package/aespipe/Config.in
similarity index 100%
rename from software/package/aespipe/Config.in
rename to buildroot/package/aespipe/Config.in
diff --git a/software/package/aespipe/Config.in.host b/buildroot/package/aespipe/Config.in.host
similarity index 100%
rename from software/package/aespipe/Config.in.host
rename to buildroot/package/aespipe/Config.in.host
diff --git a/software/package/aespipe/aespipe.hash b/buildroot/package/aespipe/aespipe.hash
similarity index 100%
rename from software/package/aespipe/aespipe.hash
rename to buildroot/package/aespipe/aespipe.hash
diff --git a/software/package/aespipe/aespipe.mk b/buildroot/package/aespipe/aespipe.mk
similarity index 100%
rename from software/package/aespipe/aespipe.mk
rename to buildroot/package/aespipe/aespipe.mk
diff --git a/software/package/agentpp/Config.in b/buildroot/package/agentpp/Config.in
similarity index 100%
rename from software/package/agentpp/Config.in
rename to buildroot/package/agentpp/Config.in
diff --git a/software/package/agentpp/agentpp.hash b/buildroot/package/agentpp/agentpp.hash
similarity index 100%
rename from software/package/agentpp/agentpp.hash
rename to buildroot/package/agentpp/agentpp.hash
diff --git a/software/package/agentpp/agentpp.mk b/buildroot/package/agentpp/agentpp.mk
similarity index 100%
rename from software/package/agentpp/agentpp.mk
rename to buildroot/package/agentpp/agentpp.mk
diff --git a/software/package/aircrack-ng/Config.in b/buildroot/package/aircrack-ng/Config.in
similarity index 100%
rename from software/package/aircrack-ng/Config.in
rename to buildroot/package/aircrack-ng/Config.in
diff --git a/software/package/aircrack-ng/aircrack-ng.hash b/buildroot/package/aircrack-ng/aircrack-ng.hash
similarity index 100%
rename from software/package/aircrack-ng/aircrack-ng.hash
rename to buildroot/package/aircrack-ng/aircrack-ng.hash
diff --git a/software/package/aircrack-ng/aircrack-ng.mk b/buildroot/package/aircrack-ng/aircrack-ng.mk
similarity index 100%
rename from software/package/aircrack-ng/aircrack-ng.mk
rename to buildroot/package/aircrack-ng/aircrack-ng.mk
diff --git a/software/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/buildroot/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch
similarity index 100%
rename from software/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch
rename to buildroot/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch
diff --git a/software/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch b/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch
similarity index 100%
rename from software/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch
rename to buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch
diff --git a/software/package/alsa-lib/Config.in b/buildroot/package/alsa-lib/Config.in
similarity index 100%
rename from software/package/alsa-lib/Config.in
rename to buildroot/package/alsa-lib/Config.in
diff --git a/software/package/alsa-lib/alsa-lib.hash b/buildroot/package/alsa-lib/alsa-lib.hash
similarity index 100%
rename from software/package/alsa-lib/alsa-lib.hash
rename to buildroot/package/alsa-lib/alsa-lib.hash
diff --git a/software/package/alsa-lib/alsa-lib.mk b/buildroot/package/alsa-lib/alsa-lib.mk
similarity index 100%
rename from software/package/alsa-lib/alsa-lib.mk
rename to buildroot/package/alsa-lib/alsa-lib.mk
diff --git a/software/package/alsa-utils/Config.in b/buildroot/package/alsa-utils/Config.in
similarity index 100%
rename from software/package/alsa-utils/Config.in
rename to buildroot/package/alsa-utils/Config.in
diff --git a/software/package/alsa-utils/alsa-utils.hash b/buildroot/package/alsa-utils/alsa-utils.hash
similarity index 100%
rename from software/package/alsa-utils/alsa-utils.hash
rename to buildroot/package/alsa-utils/alsa-utils.hash
diff --git a/software/package/alsa-utils/alsa-utils.mk b/buildroot/package/alsa-utils/alsa-utils.mk
similarity index 100%
rename from software/package/alsa-utils/alsa-utils.mk
rename to buildroot/package/alsa-utils/alsa-utils.mk
diff --git a/software/package/alsamixergui/0001-misc-fixes.patch b/buildroot/package/alsamixergui/0001-misc-fixes.patch
similarity index 100%
rename from software/package/alsamixergui/0001-misc-fixes.patch
rename to buildroot/package/alsamixergui/0001-misc-fixes.patch
diff --git a/software/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch b/buildroot/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch
similarity index 100%
rename from software/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch
rename to buildroot/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch
diff --git a/software/package/alsamixergui/Config.in b/buildroot/package/alsamixergui/Config.in
similarity index 100%
rename from software/package/alsamixergui/Config.in
rename to buildroot/package/alsamixergui/Config.in
diff --git a/software/package/alsamixergui/alsamixergui.hash b/buildroot/package/alsamixergui/alsamixergui.hash
similarity index 100%
rename from software/package/alsamixergui/alsamixergui.hash
rename to buildroot/package/alsamixergui/alsamixergui.hash
diff --git a/software/package/alsamixergui/alsamixergui.mk b/buildroot/package/alsamixergui/alsamixergui.mk
similarity index 100%
rename from software/package/alsamixergui/alsamixergui.mk
rename to buildroot/package/alsamixergui/alsamixergui.mk
diff --git a/software/package/alure/Config.in b/buildroot/package/alure/Config.in
similarity index 100%
rename from software/package/alure/Config.in
rename to buildroot/package/alure/Config.in
diff --git a/software/package/alure/alure.hash b/buildroot/package/alure/alure.hash
similarity index 100%
rename from software/package/alure/alure.hash
rename to buildroot/package/alure/alure.hash
diff --git a/software/package/alure/alure.mk b/buildroot/package/alure/alure.mk
similarity index 100%
rename from software/package/alure/alure.mk
rename to buildroot/package/alure/alure.mk
diff --git a/software/package/am335x-pru-package/0001-install-does-not-build.patch b/buildroot/package/am335x-pru-package/0001-install-does-not-build.patch
similarity index 100%
rename from software/package/am335x-pru-package/0001-install-does-not-build.patch
rename to buildroot/package/am335x-pru-package/0001-install-does-not-build.patch
diff --git a/software/package/am335x-pru-package/Config.in b/buildroot/package/am335x-pru-package/Config.in
similarity index 100%
rename from software/package/am335x-pru-package/Config.in
rename to buildroot/package/am335x-pru-package/Config.in
diff --git a/software/package/am335x-pru-package/am335x-pru-package.hash b/buildroot/package/am335x-pru-package/am335x-pru-package.hash
similarity index 100%
rename from software/package/am335x-pru-package/am335x-pru-package.hash
rename to buildroot/package/am335x-pru-package/am335x-pru-package.hash
diff --git a/software/package/am335x-pru-package/am335x-pru-package.mk b/buildroot/package/am335x-pru-package/am335x-pru-package.mk
similarity index 100%
rename from software/package/am335x-pru-package/am335x-pru-package.mk
rename to buildroot/package/am335x-pru-package/am335x-pru-package.mk
diff --git a/software/package/am33x-cm3/0001-fix-makefile.patch b/buildroot/package/am33x-cm3/0001-fix-makefile.patch
similarity index 100%
rename from software/package/am33x-cm3/0001-fix-makefile.patch
rename to buildroot/package/am33x-cm3/0001-fix-makefile.patch
diff --git a/software/package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch b/buildroot/package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch
similarity index 100%
rename from software/package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch
rename to buildroot/package/am33x-cm3/0002-Makefile-unconditionally-disable-SSP.patch
diff --git a/software/package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch b/buildroot/package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch
similarity index 100%
rename from software/package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch
rename to buildroot/package/am33x-cm3/0003-Makefile-unconditionally-disable-PIE.patch
diff --git a/software/package/am33x-cm3/Config.in b/buildroot/package/am33x-cm3/Config.in
similarity index 100%
rename from software/package/am33x-cm3/Config.in
rename to buildroot/package/am33x-cm3/Config.in
diff --git a/software/package/am33x-cm3/S93-am335x-pm-firmware-load b/buildroot/package/am33x-cm3/S93-am335x-pm-firmware-load
similarity index 100%
rename from software/package/am33x-cm3/S93-am335x-pm-firmware-load
rename to buildroot/package/am33x-cm3/S93-am335x-pm-firmware-load
diff --git a/software/package/am33x-cm3/am33x-cm3.hash b/buildroot/package/am33x-cm3/am33x-cm3.hash
similarity index 100%
rename from software/package/am33x-cm3/am33x-cm3.hash
rename to buildroot/package/am33x-cm3/am33x-cm3.hash
diff --git a/software/package/am33x-cm3/am33x-cm3.mk b/buildroot/package/am33x-cm3/am33x-cm3.mk
similarity index 100%
rename from software/package/am33x-cm3/am33x-cm3.mk
rename to buildroot/package/am33x-cm3/am33x-cm3.mk
diff --git a/software/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch b/buildroot/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch
similarity index 100%
rename from software/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch
rename to buildroot/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch
diff --git a/software/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch b/buildroot/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch
similarity index 100%
rename from software/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch
rename to buildroot/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch
diff --git a/software/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch b/buildroot/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch
similarity index 100%
rename from software/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch
rename to buildroot/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch
diff --git a/software/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch b/buildroot/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch
similarity index 100%
rename from software/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch
rename to buildroot/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch
diff --git a/software/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch b/buildroot/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch
similarity index 100%
rename from software/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch
rename to buildroot/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch
diff --git a/software/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch b/buildroot/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch
similarity index 100%
rename from software/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch
rename to buildroot/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch
diff --git a/software/package/amd-catalyst/0007-remove-gpl-symbols.patch b/buildroot/package/amd-catalyst/0007-remove-gpl-symbols.patch
similarity index 100%
rename from software/package/amd-catalyst/0007-remove-gpl-symbols.patch
rename to buildroot/package/amd-catalyst/0007-remove-gpl-symbols.patch
diff --git a/software/package/amd-catalyst/20-fglrx.conf b/buildroot/package/amd-catalyst/20-fglrx.conf
similarity index 100%
rename from software/package/amd-catalyst/20-fglrx.conf
rename to buildroot/package/amd-catalyst/20-fglrx.conf
diff --git a/software/package/amd-catalyst/Config.in b/buildroot/package/amd-catalyst/Config.in
similarity index 100%
rename from software/package/amd-catalyst/Config.in
rename to buildroot/package/amd-catalyst/Config.in
diff --git a/software/package/amd-catalyst/amd-catalyst.hash b/buildroot/package/amd-catalyst/amd-catalyst.hash
similarity index 100%
rename from software/package/amd-catalyst/amd-catalyst.hash
rename to buildroot/package/amd-catalyst/amd-catalyst.hash
diff --git a/software/package/amd-catalyst/amd-catalyst.mk b/buildroot/package/amd-catalyst/amd-catalyst.mk
similarity index 100%
rename from software/package/amd-catalyst/amd-catalyst.mk
rename to buildroot/package/amd-catalyst/amd-catalyst.mk
diff --git a/software/package/amd-catalyst/gl.pc b/buildroot/package/amd-catalyst/gl.pc
similarity index 100%
rename from software/package/amd-catalyst/gl.pc
rename to buildroot/package/amd-catalyst/gl.pc
diff --git a/software/package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch b/buildroot/package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch
similarity index 100%
rename from software/package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch
rename to buildroot/package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch
diff --git a/software/package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch b/buildroot/package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch
similarity index 100%
rename from software/package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch
rename to buildroot/package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch
diff --git a/software/package/android-tools/0003-Fix-build-issue-with-uclibc.patch b/buildroot/package/android-tools/0003-Fix-build-issue-with-uclibc.patch
similarity index 100%
rename from software/package/android-tools/0003-Fix-build-issue-with-uclibc.patch
rename to buildroot/package/android-tools/0003-Fix-build-issue-with-uclibc.patch
diff --git a/software/package/android-tools/0004-Fix-build-issue-with-musl.patch b/buildroot/package/android-tools/0004-Fix-build-issue-with-musl.patch
similarity index 100%
rename from software/package/android-tools/0004-Fix-build-issue-with-musl.patch
rename to buildroot/package/android-tools/0004-Fix-build-issue-with-musl.patch
diff --git a/software/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch b/buildroot/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch
similarity index 100%
rename from software/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch
rename to buildroot/package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch
diff --git a/software/package/android-tools/0006-fix-big-endian-build.patch b/buildroot/package/android-tools/0006-fix-big-endian-build.patch
similarity index 100%
rename from software/package/android-tools/0006-fix-big-endian-build.patch
rename to buildroot/package/android-tools/0006-fix-big-endian-build.patch
diff --git a/software/package/android-tools/0007-include-cdefs-h-when-needed.patch b/buildroot/package/android-tools/0007-include-cdefs-h-when-needed.patch
similarity index 100%
rename from software/package/android-tools/0007-include-cdefs-h-when-needed.patch
rename to buildroot/package/android-tools/0007-include-cdefs-h-when-needed.patch
diff --git a/software/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch b/buildroot/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
similarity index 100%
rename from software/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
rename to buildroot/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
diff --git a/software/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch b/buildroot/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
similarity index 100%
rename from software/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
rename to buildroot/package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
diff --git a/software/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch b/buildroot/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch
similarity index 100%
rename from software/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch
rename to buildroot/package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch
diff --git a/software/package/android-tools/Config.in b/buildroot/package/android-tools/Config.in
similarity index 100%
rename from software/package/android-tools/Config.in
rename to buildroot/package/android-tools/Config.in
diff --git a/software/package/android-tools/Config.in.host b/buildroot/package/android-tools/Config.in.host
similarity index 100%
rename from software/package/android-tools/Config.in.host
rename to buildroot/package/android-tools/Config.in.host
diff --git a/software/package/android-tools/android-tools.hash b/buildroot/package/android-tools/android-tools.hash
similarity index 100%
rename from software/package/android-tools/android-tools.hash
rename to buildroot/package/android-tools/android-tools.hash
diff --git a/software/package/android-tools/android-tools.mk b/buildroot/package/android-tools/android-tools.mk
similarity index 100%
rename from software/package/android-tools/android-tools.mk
rename to buildroot/package/android-tools/android-tools.mk
diff --git a/software/package/angular-websocket/Config.in b/buildroot/package/angular-websocket/Config.in
similarity index 100%
rename from software/package/angular-websocket/Config.in
rename to buildroot/package/angular-websocket/Config.in
diff --git a/software/package/angular-websocket/angular-websocket.hash b/buildroot/package/angular-websocket/angular-websocket.hash
similarity index 100%
rename from software/package/angular-websocket/angular-websocket.hash
rename to buildroot/package/angular-websocket/angular-websocket.hash
diff --git a/software/package/angular-websocket/angular-websocket.mk b/buildroot/package/angular-websocket/angular-websocket.mk
similarity index 100%
rename from software/package/angular-websocket/angular-websocket.mk
rename to buildroot/package/angular-websocket/angular-websocket.mk
diff --git a/software/package/angularjs/Config.in b/buildroot/package/angularjs/Config.in
similarity index 100%
rename from software/package/angularjs/Config.in
rename to buildroot/package/angularjs/Config.in
diff --git a/software/package/angularjs/angularjs.hash b/buildroot/package/angularjs/angularjs.hash
similarity index 100%
rename from software/package/angularjs/angularjs.hash
rename to buildroot/package/angularjs/angularjs.hash
diff --git a/software/package/angularjs/angularjs.mk b/buildroot/package/angularjs/angularjs.mk
similarity index 100%
rename from software/package/angularjs/angularjs.mk
rename to buildroot/package/angularjs/angularjs.mk
diff --git a/software/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch b/buildroot/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch
similarity index 100%
rename from software/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch
rename to buildroot/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch
diff --git a/software/package/aoetools/Config.in b/buildroot/package/aoetools/Config.in
similarity index 100%
rename from software/package/aoetools/Config.in
rename to buildroot/package/aoetools/Config.in
diff --git a/software/package/aoetools/aoetools.hash b/buildroot/package/aoetools/aoetools.hash
similarity index 100%
rename from software/package/aoetools/aoetools.hash
rename to buildroot/package/aoetools/aoetools.hash
diff --git a/software/package/aoetools/aoetools.mk b/buildroot/package/aoetools/aoetools.mk
similarity index 100%
rename from software/package/aoetools/aoetools.mk
rename to buildroot/package/aoetools/aoetools.mk
diff --git a/software/package/apache/0001-cross-compile.patch b/buildroot/package/apache/0001-cross-compile.patch
similarity index 100%
rename from software/package/apache/0001-cross-compile.patch
rename to buildroot/package/apache/0001-cross-compile.patch
diff --git a/software/package/apache/0002-nios2_is_not_os2.patch b/buildroot/package/apache/0002-nios2_is_not_os2.patch
similarity index 100%
rename from software/package/apache/0002-nios2_is_not_os2.patch
rename to buildroot/package/apache/0002-nios2_is_not_os2.patch
diff --git a/software/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch b/buildroot/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch
similarity index 100%
rename from software/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch
rename to buildroot/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch
diff --git a/software/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch b/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch
similarity index 100%
rename from software/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch
rename to buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch
diff --git a/software/package/apache/Config.in b/buildroot/package/apache/Config.in
similarity index 100%
rename from software/package/apache/Config.in
rename to buildroot/package/apache/Config.in
diff --git a/software/package/apache/S50apache b/buildroot/package/apache/S50apache
similarity index 100%
rename from software/package/apache/S50apache
rename to buildroot/package/apache/S50apache
diff --git a/software/package/apache/apache.hash b/buildroot/package/apache/apache.hash
similarity index 100%
rename from software/package/apache/apache.hash
rename to buildroot/package/apache/apache.hash
diff --git a/software/package/apache/apache.mk b/buildroot/package/apache/apache.mk
similarity index 100%
rename from software/package/apache/apache.mk
rename to buildroot/package/apache/apache.mk
diff --git a/software/package/apache/apache.service b/buildroot/package/apache/apache.service
similarity index 100%
rename from software/package/apache/apache.service
rename to buildroot/package/apache/apache.service
diff --git a/software/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch b/buildroot/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch
similarity index 100%
rename from software/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch
rename to buildroot/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch
diff --git a/software/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch b/buildroot/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
similarity index 100%
rename from software/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
rename to buildroot/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
diff --git a/software/package/apitrace/Config.in b/buildroot/package/apitrace/Config.in
similarity index 100%
rename from software/package/apitrace/Config.in
rename to buildroot/package/apitrace/Config.in
diff --git a/software/package/apitrace/apitrace.hash b/buildroot/package/apitrace/apitrace.hash
similarity index 100%
rename from software/package/apitrace/apitrace.hash
rename to buildroot/package/apitrace/apitrace.hash
diff --git a/software/package/apitrace/apitrace.mk b/buildroot/package/apitrace/apitrace.mk
similarity index 100%
rename from software/package/apitrace/apitrace.mk
rename to buildroot/package/apitrace/apitrace.mk
diff --git a/software/package/apr-util/0001-remove-checkapr.patch b/buildroot/package/apr-util/0001-remove-checkapr.patch
similarity index 100%
rename from software/package/apr-util/0001-remove-checkapr.patch
rename to buildroot/package/apr-util/0001-remove-checkapr.patch
diff --git a/software/package/apr-util/Config.in b/buildroot/package/apr-util/Config.in
similarity index 100%
rename from software/package/apr-util/Config.in
rename to buildroot/package/apr-util/Config.in
diff --git a/software/package/apr-util/apr-util.hash b/buildroot/package/apr-util/apr-util.hash
similarity index 100%
rename from software/package/apr-util/apr-util.hash
rename to buildroot/package/apr-util/apr-util.hash
diff --git a/software/package/apr-util/apr-util.mk b/buildroot/package/apr-util/apr-util.mk
similarity index 100%
rename from software/package/apr-util/apr-util.mk
rename to buildroot/package/apr-util/apr-util.mk
diff --git a/software/package/apr/0001-cross-compile.patch b/buildroot/package/apr/0001-cross-compile.patch
similarity index 100%
rename from software/package/apr/0001-cross-compile.patch
rename to buildroot/package/apr/0001-cross-compile.patch
diff --git a/software/package/apr/0002-sys-param-h.patch b/buildroot/package/apr/0002-sys-param-h.patch
similarity index 100%
rename from software/package/apr/0002-sys-param-h.patch
rename to buildroot/package/apr/0002-sys-param-h.patch
diff --git a/software/package/apr/Config.in b/buildroot/package/apr/Config.in
similarity index 100%
rename from software/package/apr/Config.in
rename to buildroot/package/apr/Config.in
diff --git a/software/package/apr/apr.hash b/buildroot/package/apr/apr.hash
similarity index 100%
rename from software/package/apr/apr.hash
rename to buildroot/package/apr/apr.hash
diff --git a/software/package/apr/apr.mk b/buildroot/package/apr/apr.mk
similarity index 100%
rename from software/package/apr/apr.mk
rename to buildroot/package/apr/apr.mk
diff --git a/software/package/argp-standalone/0001-throw-in-funcdef.patch b/buildroot/package/argp-standalone/0001-throw-in-funcdef.patch
similarity index 100%
rename from software/package/argp-standalone/0001-throw-in-funcdef.patch
rename to buildroot/package/argp-standalone/0001-throw-in-funcdef.patch
diff --git a/software/package/argp-standalone/0002-isprint.patch b/buildroot/package/argp-standalone/0002-isprint.patch
similarity index 100%
rename from software/package/argp-standalone/0002-isprint.patch
rename to buildroot/package/argp-standalone/0002-isprint.patch
diff --git a/software/package/argp-standalone/0003-fix_build_with_c99_compilers.patch b/buildroot/package/argp-standalone/0003-fix_build_with_c99_compilers.patch
similarity index 100%
rename from software/package/argp-standalone/0003-fix_build_with_c99_compilers.patch
rename to buildroot/package/argp-standalone/0003-fix_build_with_c99_compilers.patch
diff --git a/software/package/argp-standalone/Config.in b/buildroot/package/argp-standalone/Config.in
similarity index 100%
rename from software/package/argp-standalone/Config.in
rename to buildroot/package/argp-standalone/Config.in
diff --git a/software/package/argp-standalone/argp-standalone.hash b/buildroot/package/argp-standalone/argp-standalone.hash
similarity index 100%
rename from software/package/argp-standalone/argp-standalone.hash
rename to buildroot/package/argp-standalone/argp-standalone.hash
diff --git a/software/package/argp-standalone/argp-standalone.mk b/buildroot/package/argp-standalone/argp-standalone.mk
similarity index 100%
rename from software/package/argp-standalone/argp-standalone.mk
rename to buildroot/package/argp-standalone/argp-standalone.mk
diff --git a/software/package/argparse/Config.in b/buildroot/package/argparse/Config.in
similarity index 100%
rename from software/package/argparse/Config.in
rename to buildroot/package/argparse/Config.in
diff --git a/software/package/argparse/argparse.hash b/buildroot/package/argparse/argparse.hash
similarity index 100%
rename from software/package/argparse/argparse.hash
rename to buildroot/package/argparse/argparse.hash
diff --git a/software/package/argparse/argparse.mk b/buildroot/package/argparse/argparse.mk
similarity index 100%
rename from software/package/argparse/argparse.mk
rename to buildroot/package/argparse/argparse.mk
diff --git a/software/package/argus/Config.in b/buildroot/package/argus/Config.in
similarity index 100%
rename from software/package/argus/Config.in
rename to buildroot/package/argus/Config.in
diff --git a/software/package/argus/argus.hash b/buildroot/package/argus/argus.hash
similarity index 100%
rename from software/package/argus/argus.hash
rename to buildroot/package/argus/argus.hash
diff --git a/software/package/argus/argus.mk b/buildroot/package/argus/argus.mk
similarity index 100%
rename from software/package/argus/argus.mk
rename to buildroot/package/argus/argus.mk
diff --git a/software/package/armadillo/Config.in b/buildroot/package/armadillo/Config.in
similarity index 100%
rename from software/package/armadillo/Config.in
rename to buildroot/package/armadillo/Config.in
diff --git a/software/package/armadillo/armadillo.hash b/buildroot/package/armadillo/armadillo.hash
similarity index 100%
rename from software/package/armadillo/armadillo.hash
rename to buildroot/package/armadillo/armadillo.hash
diff --git a/software/package/armadillo/armadillo.mk b/buildroot/package/armadillo/armadillo.mk
similarity index 100%
rename from software/package/armadillo/armadillo.mk
rename to buildroot/package/armadillo/armadillo.mk
diff --git a/software/package/armbian-firmware/Config.in b/buildroot/package/armbian-firmware/Config.in
similarity index 100%
rename from software/package/armbian-firmware/Config.in
rename to buildroot/package/armbian-firmware/Config.in
diff --git a/software/package/armbian-firmware/armbian-firmware.hash b/buildroot/package/armbian-firmware/armbian-firmware.hash
similarity index 100%
rename from software/package/armbian-firmware/armbian-firmware.hash
rename to buildroot/package/armbian-firmware/armbian-firmware.hash
diff --git a/software/package/armbian-firmware/armbian-firmware.mk b/buildroot/package/armbian-firmware/armbian-firmware.mk
similarity index 100%
rename from software/package/armbian-firmware/armbian-firmware.mk
rename to buildroot/package/armbian-firmware/armbian-firmware.mk
diff --git a/software/package/arp-scan/Config.in b/buildroot/package/arp-scan/Config.in
similarity index 100%
rename from software/package/arp-scan/Config.in
rename to buildroot/package/arp-scan/Config.in
diff --git a/software/package/arp-scan/arp-scan.hash b/buildroot/package/arp-scan/arp-scan.hash
similarity index 100%
rename from software/package/arp-scan/arp-scan.hash
rename to buildroot/package/arp-scan/arp-scan.hash
diff --git a/software/package/arp-scan/arp-scan.mk b/buildroot/package/arp-scan/arp-scan.mk
similarity index 100%
rename from software/package/arp-scan/arp-scan.mk
rename to buildroot/package/arp-scan/arp-scan.mk
diff --git a/software/package/arptables/0001-Fix-musl-build-issue.patch b/buildroot/package/arptables/0001-Fix-musl-build-issue.patch
similarity index 100%
rename from software/package/arptables/0001-Fix-musl-build-issue.patch
rename to buildroot/package/arptables/0001-Fix-musl-build-issue.patch
diff --git a/software/package/arptables/Config.in b/buildroot/package/arptables/Config.in
similarity index 100%
rename from software/package/arptables/Config.in
rename to buildroot/package/arptables/Config.in
diff --git a/software/package/arptables/arptables.hash b/buildroot/package/arptables/arptables.hash
similarity index 100%
rename from software/package/arptables/arptables.hash
rename to buildroot/package/arptables/arptables.hash
diff --git a/software/package/arptables/arptables.mk b/buildroot/package/arptables/arptables.mk
similarity index 100%
rename from software/package/arptables/arptables.mk
rename to buildroot/package/arptables/arptables.mk
diff --git a/software/package/ascii-invaders/Config.in b/buildroot/package/ascii-invaders/Config.in
similarity index 100%
rename from software/package/ascii-invaders/Config.in
rename to buildroot/package/ascii-invaders/Config.in
diff --git a/software/package/ascii-invaders/ascii-invaders.hash b/buildroot/package/ascii-invaders/ascii-invaders.hash
similarity index 100%
rename from software/package/ascii-invaders/ascii-invaders.hash
rename to buildroot/package/ascii-invaders/ascii-invaders.hash
diff --git a/software/package/ascii-invaders/ascii-invaders.mk b/buildroot/package/ascii-invaders/ascii-invaders.mk
similarity index 100%
rename from software/package/ascii-invaders/ascii-invaders.mk
rename to buildroot/package/ascii-invaders/ascii-invaders.mk
diff --git a/software/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch b/buildroot/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch
similarity index 100%
rename from software/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch
rename to buildroot/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch
diff --git a/software/package/assimp/Config.in b/buildroot/package/assimp/Config.in
similarity index 100%
rename from software/package/assimp/Config.in
rename to buildroot/package/assimp/Config.in
diff --git a/software/package/assimp/assimp.hash b/buildroot/package/assimp/assimp.hash
similarity index 100%
rename from software/package/assimp/assimp.hash
rename to buildroot/package/assimp/assimp.hash
diff --git a/software/package/assimp/assimp.mk b/buildroot/package/assimp/assimp.mk
similarity index 100%
rename from software/package/assimp/assimp.mk
rename to buildroot/package/assimp/assimp.mk
diff --git a/software/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch b/buildroot/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch
similarity index 100%
rename from software/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch
rename to buildroot/package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch
diff --git a/software/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch b/buildroot/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch
similarity index 100%
rename from software/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch
rename to buildroot/package/asterisk/0002-configure-fix-detection-of-libcrypt.patch
diff --git a/software/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch b/buildroot/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch
similarity index 100%
rename from software/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch
rename to buildroot/package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch
diff --git a/software/package/asterisk/0004-install-samples-need-the-data-files.patch b/buildroot/package/asterisk/0004-install-samples-need-the-data-files.patch
similarity index 100%
rename from software/package/asterisk/0004-install-samples-need-the-data-files.patch
rename to buildroot/package/asterisk/0004-install-samples-need-the-data-files.patch
diff --git a/software/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch b/buildroot/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch
similarity index 100%
rename from software/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch
rename to buildroot/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch
diff --git a/software/package/asterisk/Config.in b/buildroot/package/asterisk/Config.in
similarity index 100%
rename from software/package/asterisk/Config.in
rename to buildroot/package/asterisk/Config.in
diff --git a/software/package/asterisk/asterisk.hash b/buildroot/package/asterisk/asterisk.hash
similarity index 100%
rename from software/package/asterisk/asterisk.hash
rename to buildroot/package/asterisk/asterisk.hash
diff --git a/software/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk
similarity index 100%
rename from software/package/asterisk/asterisk.mk
rename to buildroot/package/asterisk/asterisk.mk
diff --git a/software/package/at-spi2-atk/Config.in b/buildroot/package/at-spi2-atk/Config.in
similarity index 100%
rename from software/package/at-spi2-atk/Config.in
rename to buildroot/package/at-spi2-atk/Config.in
diff --git a/software/package/at-spi2-atk/at-spi2-atk.hash b/buildroot/package/at-spi2-atk/at-spi2-atk.hash
similarity index 100%
rename from software/package/at-spi2-atk/at-spi2-atk.hash
rename to buildroot/package/at-spi2-atk/at-spi2-atk.hash
diff --git a/software/package/at-spi2-atk/at-spi2-atk.mk b/buildroot/package/at-spi2-atk/at-spi2-atk.mk
similarity index 100%
rename from software/package/at-spi2-atk/at-spi2-atk.mk
rename to buildroot/package/at-spi2-atk/at-spi2-atk.mk
diff --git a/software/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch b/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
similarity index 100%
rename from software/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
rename to buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch
diff --git a/software/package/at-spi2-core/Config.in b/buildroot/package/at-spi2-core/Config.in
similarity index 100%
rename from software/package/at-spi2-core/Config.in
rename to buildroot/package/at-spi2-core/Config.in
diff --git a/software/package/at-spi2-core/at-spi2-core.hash b/buildroot/package/at-spi2-core/at-spi2-core.hash
similarity index 100%
rename from software/package/at-spi2-core/at-spi2-core.hash
rename to buildroot/package/at-spi2-core/at-spi2-core.hash
diff --git a/software/package/at-spi2-core/at-spi2-core.mk b/buildroot/package/at-spi2-core/at-spi2-core.mk
similarity index 100%
rename from software/package/at-spi2-core/at-spi2-core.mk
rename to buildroot/package/at-spi2-core/at-spi2-core.mk
diff --git a/software/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch b/buildroot/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch
similarity index 100%
rename from software/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch
rename to buildroot/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch
diff --git a/software/package/at/0002-Makefile.in-make-install-fix.patch b/buildroot/package/at/0002-Makefile.in-make-install-fix.patch
similarity index 100%
rename from software/package/at/0002-Makefile.in-make-install-fix.patch
rename to buildroot/package/at/0002-Makefile.in-make-install-fix.patch
diff --git a/software/package/at/0003-getloadavg.c-fix.patch b/buildroot/package/at/0003-getloadavg.c-fix.patch
similarity index 100%
rename from software/package/at/0003-getloadavg.c-fix.patch
rename to buildroot/package/at/0003-getloadavg.c-fix.patch
diff --git a/software/package/at/0004-Makefile-fix-parallel-build-failure.patch b/buildroot/package/at/0004-Makefile-fix-parallel-build-failure.patch
similarity index 100%
rename from software/package/at/0004-Makefile-fix-parallel-build-failure.patch
rename to buildroot/package/at/0004-Makefile-fix-parallel-build-failure.patch
diff --git a/software/package/at/Config.in b/buildroot/package/at/Config.in
similarity index 100%
rename from software/package/at/Config.in
rename to buildroot/package/at/Config.in
diff --git a/software/package/at/S99at b/buildroot/package/at/S99at
similarity index 100%
rename from software/package/at/S99at
rename to buildroot/package/at/S99at
diff --git a/software/package/at/at.hash b/buildroot/package/at/at.hash
similarity index 100%
rename from software/package/at/at.hash
rename to buildroot/package/at/at.hash
diff --git a/software/package/at/at.mk b/buildroot/package/at/at.mk
similarity index 100%
rename from software/package/at/at.mk
rename to buildroot/package/at/at.mk
diff --git a/software/package/atest/Config.in b/buildroot/package/atest/Config.in
similarity index 100%
rename from software/package/atest/Config.in
rename to buildroot/package/atest/Config.in
diff --git a/software/package/atest/atest.hash b/buildroot/package/atest/atest.hash
similarity index 100%
rename from software/package/atest/atest.hash
rename to buildroot/package/atest/atest.hash
diff --git a/software/package/atest/atest.mk b/buildroot/package/atest/atest.mk
similarity index 100%
rename from software/package/atest/atest.mk
rename to buildroot/package/atest/atest.mk
diff --git a/software/package/atf/Config.in b/buildroot/package/atf/Config.in
similarity index 100%
rename from software/package/atf/Config.in
rename to buildroot/package/atf/Config.in
diff --git a/software/package/atf/atf.hash b/buildroot/package/atf/atf.hash
similarity index 100%
rename from software/package/atf/atf.hash
rename to buildroot/package/atf/atf.hash
diff --git a/software/package/atf/atf.mk b/buildroot/package/atf/atf.mk
similarity index 100%
rename from software/package/atf/atf.mk
rename to buildroot/package/atf/atf.mk
diff --git a/software/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch b/buildroot/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch
similarity index 100%
rename from software/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch
rename to buildroot/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch
diff --git a/software/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch b/buildroot/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch
similarity index 100%
rename from software/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch
rename to buildroot/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch
diff --git a/software/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/buildroot/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
similarity index 100%
rename from software/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
rename to buildroot/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
diff --git a/software/package/atftp/Config.in b/buildroot/package/atftp/Config.in
similarity index 100%
rename from software/package/atftp/Config.in
rename to buildroot/package/atftp/Config.in
diff --git a/software/package/atftp/atftp.hash b/buildroot/package/atftp/atftp.hash
similarity index 100%
rename from software/package/atftp/atftp.hash
rename to buildroot/package/atftp/atftp.hash
diff --git a/software/package/atftp/atftp.mk b/buildroot/package/atftp/atftp.mk
similarity index 100%
rename from software/package/atftp/atftp.mk
rename to buildroot/package/atftp/atftp.mk
diff --git a/software/package/atk/Config.in b/buildroot/package/atk/Config.in
similarity index 100%
rename from software/package/atk/Config.in
rename to buildroot/package/atk/Config.in
diff --git a/software/package/atk/atk.hash b/buildroot/package/atk/atk.hash
similarity index 100%
rename from software/package/atk/atk.hash
rename to buildroot/package/atk/atk.hash
diff --git a/software/package/atk/atk.mk b/buildroot/package/atk/atk.mk
similarity index 100%
rename from software/package/atk/atk.mk
rename to buildroot/package/atk/atk.mk
diff --git a/software/package/atkmm/Config.in b/buildroot/package/atkmm/Config.in
similarity index 100%
rename from software/package/atkmm/Config.in
rename to buildroot/package/atkmm/Config.in
diff --git a/software/package/atkmm/atkmm.hash b/buildroot/package/atkmm/atkmm.hash
similarity index 100%
rename from software/package/atkmm/atkmm.hash
rename to buildroot/package/atkmm/atkmm.hash
diff --git a/software/package/atkmm/atkmm.mk b/buildroot/package/atkmm/atkmm.mk
similarity index 100%
rename from software/package/atkmm/atkmm.mk
rename to buildroot/package/atkmm/atkmm.mk
diff --git a/software/package/atop/Config.in b/buildroot/package/atop/Config.in
similarity index 100%
rename from software/package/atop/Config.in
rename to buildroot/package/atop/Config.in
diff --git a/software/package/atop/atop.hash b/buildroot/package/atop/atop.hash
similarity index 100%
rename from software/package/atop/atop.hash
rename to buildroot/package/atop/atop.hash
diff --git a/software/package/atop/atop.mk b/buildroot/package/atop/atop.mk
similarity index 100%
rename from software/package/atop/atop.mk
rename to buildroot/package/atop/atop.mk
diff --git a/software/package/attr/0001-build-with-older-GCCs.patch b/buildroot/package/attr/0001-build-with-older-GCCs.patch
similarity index 100%
rename from software/package/attr/0001-build-with-older-GCCs.patch
rename to buildroot/package/attr/0001-build-with-older-GCCs.patch
diff --git a/software/package/attr/0002-Switch-back-to-syscall.patch b/buildroot/package/attr/0002-Switch-back-to-syscall.patch
similarity index 100%
rename from software/package/attr/0002-Switch-back-to-syscall.patch
rename to buildroot/package/attr/0002-Switch-back-to-syscall.patch
diff --git a/software/package/attr/Config.in b/buildroot/package/attr/Config.in
similarity index 100%
rename from software/package/attr/Config.in
rename to buildroot/package/attr/Config.in
diff --git a/software/package/attr/attr.hash b/buildroot/package/attr/attr.hash
similarity index 100%
rename from software/package/attr/attr.hash
rename to buildroot/package/attr/attr.hash
diff --git a/software/package/attr/attr.mk b/buildroot/package/attr/attr.mk
similarity index 100%
rename from software/package/attr/attr.mk
rename to buildroot/package/attr/attr.mk
diff --git a/software/package/aubio/Config.in b/buildroot/package/aubio/Config.in
similarity index 100%
rename from software/package/aubio/Config.in
rename to buildroot/package/aubio/Config.in
diff --git a/software/package/aubio/aubio.hash b/buildroot/package/aubio/aubio.hash
similarity index 100%
rename from software/package/aubio/aubio.hash
rename to buildroot/package/aubio/aubio.hash
diff --git a/software/package/aubio/aubio.mk b/buildroot/package/aubio/aubio.mk
similarity index 100%
rename from software/package/aubio/aubio.mk
rename to buildroot/package/aubio/aubio.mk
diff --git a/software/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch b/buildroot/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch
similarity index 100%
rename from software/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch
rename to buildroot/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch
diff --git a/software/package/audiofile/0002-cast-to-unsigned-gcc6.patch b/buildroot/package/audiofile/0002-cast-to-unsigned-gcc6.patch
similarity index 100%
rename from software/package/audiofile/0002-cast-to-unsigned-gcc6.patch
rename to buildroot/package/audiofile/0002-cast-to-unsigned-gcc6.patch
diff --git a/software/package/audiofile/0003-Always-check-the-number-of-coefficients.patch b/buildroot/package/audiofile/0003-Always-check-the-number-of-coefficients.patch
similarity index 100%
rename from software/package/audiofile/0003-Always-check-the-number-of-coefficients.patch
rename to buildroot/package/audiofile/0003-Always-check-the-number-of-coefficients.patch
diff --git a/software/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch b/buildroot/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch
similarity index 100%
rename from software/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch
rename to buildroot/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch
diff --git a/software/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch b/buildroot/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch
similarity index 100%
rename from software/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch
rename to buildroot/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch
diff --git a/software/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch b/buildroot/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch
similarity index 100%
rename from software/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch
rename to buildroot/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch
diff --git a/software/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch b/buildroot/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch
similarity index 100%
rename from software/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch
rename to buildroot/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch
diff --git a/software/package/audiofile/0008-CVE-2015-7747.patch b/buildroot/package/audiofile/0008-CVE-2015-7747.patch
similarity index 100%
rename from software/package/audiofile/0008-CVE-2015-7747.patch
rename to buildroot/package/audiofile/0008-CVE-2015-7747.patch
diff --git a/software/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch b/buildroot/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch
similarity index 100%
rename from software/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch
rename to buildroot/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch
diff --git a/software/package/audiofile/Config.in b/buildroot/package/audiofile/Config.in
similarity index 100%
rename from software/package/audiofile/Config.in
rename to buildroot/package/audiofile/Config.in
diff --git a/software/package/audiofile/audiofile.hash b/buildroot/package/audiofile/audiofile.hash
similarity index 100%
rename from software/package/audiofile/audiofile.hash
rename to buildroot/package/audiofile/audiofile.hash
diff --git a/software/package/audiofile/audiofile.mk b/buildroot/package/audiofile/audiofile.mk
similarity index 100%
rename from software/package/audiofile/audiofile.mk
rename to buildroot/package/audiofile/audiofile.mk
diff --git a/software/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch b/buildroot/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch
similarity index 100%
rename from software/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch
rename to buildroot/package/audit/0001-Fix-audispd-path-in-auditd.conf.patch
diff --git a/software/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch b/buildroot/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch
similarity index 100%
rename from software/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch
rename to buildroot/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch
diff --git a/software/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch b/buildroot/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch
similarity index 100%
rename from software/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch
rename to buildroot/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch
diff --git a/software/package/audit/Config.in b/buildroot/package/audit/Config.in
similarity index 100%
rename from software/package/audit/Config.in
rename to buildroot/package/audit/Config.in
diff --git a/software/package/audit/S02auditd b/buildroot/package/audit/S02auditd
similarity index 100%
rename from software/package/audit/S02auditd
rename to buildroot/package/audit/S02auditd
diff --git a/software/package/audit/audit.hash b/buildroot/package/audit/audit.hash
similarity index 100%
rename from software/package/audit/audit.hash
rename to buildroot/package/audit/audit.hash
diff --git a/software/package/audit/audit.mk b/buildroot/package/audit/audit.mk
similarity index 100%
rename from software/package/audit/audit.mk
rename to buildroot/package/audit/audit.mk
diff --git a/software/package/audit/audit_tmpfiles.conf b/buildroot/package/audit/audit_tmpfiles.conf
similarity index 100%
rename from software/package/audit/audit_tmpfiles.conf
rename to buildroot/package/audit/audit_tmpfiles.conf
diff --git a/software/package/aufs-util/0001-remove-user-settings.patch b/buildroot/package/aufs-util/0001-remove-user-settings.patch
similarity index 100%
rename from software/package/aufs-util/0001-remove-user-settings.patch
rename to buildroot/package/aufs-util/0001-remove-user-settings.patch
diff --git a/software/package/aufs-util/0002-no-check-ver.patch b/buildroot/package/aufs-util/0002-no-check-ver.patch
similarity index 100%
rename from software/package/aufs-util/0002-no-check-ver.patch
rename to buildroot/package/aufs-util/0002-no-check-ver.patch
diff --git a/software/package/aufs-util/0003-no-strip-lib.patch b/buildroot/package/aufs-util/0003-no-strip-lib.patch
similarity index 100%
rename from software/package/aufs-util/0003-no-strip-lib.patch
rename to buildroot/package/aufs-util/0003-no-strip-lib.patch
diff --git a/software/package/aufs-util/Config.in b/buildroot/package/aufs-util/Config.in
similarity index 100%
rename from software/package/aufs-util/Config.in
rename to buildroot/package/aufs-util/Config.in
diff --git a/software/package/aufs-util/aufs-util.mk b/buildroot/package/aufs-util/aufs-util.mk
similarity index 100%
rename from software/package/aufs-util/aufs-util.mk
rename to buildroot/package/aufs-util/aufs-util.mk
diff --git a/software/package/aufs/Config.in b/buildroot/package/aufs/Config.in
similarity index 100%
rename from software/package/aufs/Config.in
rename to buildroot/package/aufs/Config.in
diff --git a/software/package/aufs/aufs.mk b/buildroot/package/aufs/aufs.mk
similarity index 100%
rename from software/package/aufs/aufs.mk
rename to buildroot/package/aufs/aufs.mk
diff --git a/software/package/augeas/Config.in b/buildroot/package/augeas/Config.in
similarity index 100%
rename from software/package/augeas/Config.in
rename to buildroot/package/augeas/Config.in
diff --git a/software/package/augeas/augeas.hash b/buildroot/package/augeas/augeas.hash
similarity index 100%
rename from software/package/augeas/augeas.hash
rename to buildroot/package/augeas/augeas.hash
diff --git a/software/package/augeas/augeas.mk b/buildroot/package/augeas/augeas.mk
similarity index 100%
rename from software/package/augeas/augeas.mk
rename to buildroot/package/augeas/augeas.mk
diff --git a/software/package/aumix/0001-fix-incorrect-makefile-am.patch b/buildroot/package/aumix/0001-fix-incorrect-makefile-am.patch
similarity index 100%
rename from software/package/aumix/0001-fix-incorrect-makefile-am.patch
rename to buildroot/package/aumix/0001-fix-incorrect-makefile-am.patch
diff --git a/software/package/aumix/Config.in b/buildroot/package/aumix/Config.in
similarity index 100%
rename from software/package/aumix/Config.in
rename to buildroot/package/aumix/Config.in
diff --git a/software/package/aumix/aumix.hash b/buildroot/package/aumix/aumix.hash
similarity index 100%
rename from software/package/aumix/aumix.hash
rename to buildroot/package/aumix/aumix.hash
diff --git a/software/package/aumix/aumix.mk b/buildroot/package/aumix/aumix.mk
similarity index 100%
rename from software/package/aumix/aumix.mk
rename to buildroot/package/aumix/aumix.mk
diff --git a/software/package/autoconf-archive/autoconf-archive.hash b/buildroot/package/autoconf-archive/autoconf-archive.hash
similarity index 100%
rename from software/package/autoconf-archive/autoconf-archive.hash
rename to buildroot/package/autoconf-archive/autoconf-archive.hash
diff --git a/software/package/autoconf-archive/autoconf-archive.mk b/buildroot/package/autoconf-archive/autoconf-archive.mk
similarity index 100%
rename from software/package/autoconf-archive/autoconf-archive.mk
rename to buildroot/package/autoconf-archive/autoconf-archive.mk
diff --git a/software/package/autoconf/0001-dont-add-dirty-to-version.patch b/buildroot/package/autoconf/0001-dont-add-dirty-to-version.patch
similarity index 100%
rename from software/package/autoconf/0001-dont-add-dirty-to-version.patch
rename to buildroot/package/autoconf/0001-dont-add-dirty-to-version.patch
diff --git a/software/package/autoconf/autoconf.hash b/buildroot/package/autoconf/autoconf.hash
similarity index 100%
rename from software/package/autoconf/autoconf.hash
rename to buildroot/package/autoconf/autoconf.hash
diff --git a/software/package/autoconf/autoconf.mk b/buildroot/package/autoconf/autoconf.mk
similarity index 100%
rename from software/package/autoconf/autoconf.mk
rename to buildroot/package/autoconf/autoconf.mk
diff --git a/software/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch b/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch
similarity index 100%
rename from software/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch
rename to buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch
diff --git a/software/package/autofs/Config.in b/buildroot/package/autofs/Config.in
similarity index 100%
rename from software/package/autofs/Config.in
rename to buildroot/package/autofs/Config.in
diff --git a/software/package/autofs/autofs.hash b/buildroot/package/autofs/autofs.hash
similarity index 100%
rename from software/package/autofs/autofs.hash
rename to buildroot/package/autofs/autofs.hash
diff --git a/software/package/autofs/autofs.mk b/buildroot/package/autofs/autofs.mk
similarity index 100%
rename from software/package/autofs/autofs.mk
rename to buildroot/package/autofs/autofs.mk
diff --git a/software/package/automake/0001-noman.patch b/buildroot/package/automake/0001-noman.patch
similarity index 100%
rename from software/package/automake/0001-noman.patch
rename to buildroot/package/automake/0001-noman.patch
diff --git a/software/package/automake/automake.hash b/buildroot/package/automake/automake.hash
similarity index 100%
rename from software/package/automake/automake.hash
rename to buildroot/package/automake/automake.hash
diff --git a/software/package/automake/automake.mk b/buildroot/package/automake/automake.mk
similarity index 100%
rename from software/package/automake/automake.mk
rename to buildroot/package/automake/automake.mk
diff --git a/software/package/automake/gtk-doc.m4 b/buildroot/package/automake/gtk-doc.m4
similarity index 100%
rename from software/package/automake/gtk-doc.m4
rename to buildroot/package/automake/gtk-doc.m4
diff --git a/software/package/autossh/Config.in b/buildroot/package/autossh/Config.in
similarity index 100%
rename from software/package/autossh/Config.in
rename to buildroot/package/autossh/Config.in
diff --git a/software/package/autossh/autossh.hash b/buildroot/package/autossh/autossh.hash
similarity index 100%
rename from software/package/autossh/autossh.hash
rename to buildroot/package/autossh/autossh.hash
diff --git a/software/package/autossh/autossh.mk b/buildroot/package/autossh/autossh.mk
similarity index 100%
rename from software/package/autossh/autossh.mk
rename to buildroot/package/autossh/autossh.mk
diff --git a/software/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch b/buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
similarity index 100%
rename from software/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
rename to buildroot/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
diff --git a/software/package/avahi/Config.in b/buildroot/package/avahi/Config.in
similarity index 100%
rename from software/package/avahi/Config.in
rename to buildroot/package/avahi/Config.in
diff --git a/software/package/avahi/S05avahi-setup.sh b/buildroot/package/avahi/S05avahi-setup.sh
similarity index 100%
rename from software/package/avahi/S05avahi-setup.sh
rename to buildroot/package/avahi/S05avahi-setup.sh
diff --git a/software/package/avahi/S50avahi-daemon b/buildroot/package/avahi/S50avahi-daemon
similarity index 100%
rename from software/package/avahi/S50avahi-daemon
rename to buildroot/package/avahi/S50avahi-daemon
diff --git a/software/package/avahi/avahi.hash b/buildroot/package/avahi/avahi.hash
similarity index 100%
rename from software/package/avahi/avahi.hash
rename to buildroot/package/avahi/avahi.hash
diff --git a/software/package/avahi/avahi.mk b/buildroot/package/avahi/avahi.mk
similarity index 100%
rename from software/package/avahi/avahi.mk
rename to buildroot/package/avahi/avahi.mk
diff --git a/software/package/avahi/avahi_sysusers.conf b/buildroot/package/avahi/avahi_sysusers.conf
similarity index 100%
rename from software/package/avahi/avahi_sysusers.conf
rename to buildroot/package/avahi/avahi_sysusers.conf
diff --git a/software/package/avahi/avahi_tmpfiles.conf b/buildroot/package/avahi/avahi_tmpfiles.conf
similarity index 100%
rename from software/package/avahi/avahi_tmpfiles.conf
rename to buildroot/package/avahi/avahi_tmpfiles.conf
diff --git a/software/package/avrdude/Config.in b/buildroot/package/avrdude/Config.in
similarity index 100%
rename from software/package/avrdude/Config.in
rename to buildroot/package/avrdude/Config.in
diff --git a/software/package/avrdude/avrdude.hash b/buildroot/package/avrdude/avrdude.hash
similarity index 100%
rename from software/package/avrdude/avrdude.hash
rename to buildroot/package/avrdude/avrdude.hash
diff --git a/software/package/avrdude/avrdude.mk b/buildroot/package/avrdude/avrdude.mk
similarity index 100%
rename from software/package/avrdude/avrdude.mk
rename to buildroot/package/avrdude/avrdude.mk
diff --git a/software/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch b/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch
similarity index 100%
rename from software/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch
rename to buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch
diff --git a/software/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch
similarity index 100%
rename from software/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch
rename to buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch
diff --git a/software/package/avro-c/Config.in b/buildroot/package/avro-c/Config.in
similarity index 100%
rename from software/package/avro-c/Config.in
rename to buildroot/package/avro-c/Config.in
diff --git a/software/package/avro-c/avro-c.hash b/buildroot/package/avro-c/avro-c.hash
similarity index 100%
rename from software/package/avro-c/avro-c.hash
rename to buildroot/package/avro-c/avro-c.hash
diff --git a/software/package/avro-c/avro-c.mk b/buildroot/package/avro-c/avro-c.mk
similarity index 100%
rename from software/package/avro-c/avro-c.mk
rename to buildroot/package/avro-c/avro-c.mk
diff --git a/software/package/axel/Config.in b/buildroot/package/axel/Config.in
similarity index 100%
rename from software/package/axel/Config.in
rename to buildroot/package/axel/Config.in
diff --git a/software/package/axel/axel.hash b/buildroot/package/axel/axel.hash
similarity index 100%
rename from software/package/axel/axel.hash
rename to buildroot/package/axel/axel.hash
diff --git a/software/package/axel/axel.mk b/buildroot/package/axel/axel.mk
similarity index 100%
rename from software/package/axel/axel.mk
rename to buildroot/package/axel/axel.mk
diff --git a/software/package/axfsutils/axfsutils.hash b/buildroot/package/axfsutils/axfsutils.hash
similarity index 100%
rename from software/package/axfsutils/axfsutils.hash
rename to buildroot/package/axfsutils/axfsutils.hash
diff --git a/software/package/axfsutils/axfsutils.mk b/buildroot/package/axfsutils/axfsutils.mk
similarity index 100%
rename from software/package/axfsutils/axfsutils.mk
rename to buildroot/package/axfsutils/axfsutils.mk
diff --git a/software/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch b/buildroot/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch
similarity index 100%
rename from software/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch
rename to buildroot/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch
diff --git a/software/package/azmq/Config.in b/buildroot/package/azmq/Config.in
similarity index 100%
rename from software/package/azmq/Config.in
rename to buildroot/package/azmq/Config.in
diff --git a/software/package/azmq/azmq.hash b/buildroot/package/azmq/azmq.hash
similarity index 100%
rename from software/package/azmq/azmq.hash
rename to buildroot/package/azmq/azmq.hash
diff --git a/software/package/azmq/azmq.mk b/buildroot/package/azmq/azmq.mk
similarity index 100%
rename from software/package/azmq/azmq.mk
rename to buildroot/package/azmq/azmq.mk
diff --git a/software/package/azure-iot-sdk-c/Config.in b/buildroot/package/azure-iot-sdk-c/Config.in
similarity index 100%
rename from software/package/azure-iot-sdk-c/Config.in
rename to buildroot/package/azure-iot-sdk-c/Config.in
diff --git a/software/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
similarity index 100%
rename from software/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
rename to buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
diff --git a/software/package/b43-firmware/Config.in b/buildroot/package/b43-firmware/Config.in
similarity index 100%
rename from software/package/b43-firmware/Config.in
rename to buildroot/package/b43-firmware/Config.in
diff --git a/software/package/b43-firmware/b43-firmware.hash b/buildroot/package/b43-firmware/b43-firmware.hash
similarity index 100%
rename from software/package/b43-firmware/b43-firmware.hash
rename to buildroot/package/b43-firmware/b43-firmware.hash
diff --git a/software/package/b43-firmware/b43-firmware.mk b/buildroot/package/b43-firmware/b43-firmware.mk
similarity index 100%
rename from software/package/b43-firmware/b43-firmware.mk
rename to buildroot/package/b43-firmware/b43-firmware.mk
diff --git a/software/package/b43-fwcutter/b43-fwcutter.hash b/buildroot/package/b43-fwcutter/b43-fwcutter.hash
similarity index 100%
rename from software/package/b43-fwcutter/b43-fwcutter.hash
rename to buildroot/package/b43-fwcutter/b43-fwcutter.hash
diff --git a/software/package/b43-fwcutter/b43-fwcutter.mk b/buildroot/package/b43-fwcutter/b43-fwcutter.mk
similarity index 100%
rename from software/package/b43-fwcutter/b43-fwcutter.mk
rename to buildroot/package/b43-fwcutter/b43-fwcutter.mk
diff --git a/software/package/babeld/Config.in b/buildroot/package/babeld/Config.in
similarity index 100%
rename from software/package/babeld/Config.in
rename to buildroot/package/babeld/Config.in
diff --git a/software/package/babeld/S50babeld b/buildroot/package/babeld/S50babeld
similarity index 100%
rename from software/package/babeld/S50babeld
rename to buildroot/package/babeld/S50babeld
diff --git a/software/package/babeld/babeld.hash b/buildroot/package/babeld/babeld.hash
similarity index 100%
rename from software/package/babeld/babeld.hash
rename to buildroot/package/babeld/babeld.hash
diff --git a/software/package/babeld/babeld.mk b/buildroot/package/babeld/babeld.mk
similarity index 100%
rename from software/package/babeld/babeld.mk
rename to buildroot/package/babeld/babeld.mk
diff --git a/software/package/babeld/babeld.service b/buildroot/package/babeld/babeld.service
similarity index 100%
rename from software/package/babeld/babeld.service
rename to buildroot/package/babeld/babeld.service
diff --git a/software/package/bandwidthd/Config.in b/buildroot/package/bandwidthd/Config.in
similarity index 100%
rename from software/package/bandwidthd/Config.in
rename to buildroot/package/bandwidthd/Config.in
diff --git a/software/package/bandwidthd/bandwidthd.hash b/buildroot/package/bandwidthd/bandwidthd.hash
similarity index 100%
rename from software/package/bandwidthd/bandwidthd.hash
rename to buildroot/package/bandwidthd/bandwidthd.hash
diff --git a/software/package/bandwidthd/bandwidthd.mk b/buildroot/package/bandwidthd/bandwidthd.mk
similarity index 100%
rename from software/package/bandwidthd/bandwidthd.mk
rename to buildroot/package/bandwidthd/bandwidthd.mk
diff --git a/software/package/bandwidthd/bandwidthd.service b/buildroot/package/bandwidthd/bandwidthd.service
similarity index 100%
rename from software/package/bandwidthd/bandwidthd.service
rename to buildroot/package/bandwidthd/bandwidthd.service
diff --git a/software/package/bash-completion/Config.in b/buildroot/package/bash-completion/Config.in
similarity index 100%
rename from software/package/bash-completion/Config.in
rename to buildroot/package/bash-completion/Config.in
diff --git a/software/package/bash-completion/bash-completion.hash b/buildroot/package/bash-completion/bash-completion.hash
similarity index 100%
rename from software/package/bash-completion/bash-completion.hash
rename to buildroot/package/bash-completion/bash-completion.hash
diff --git a/software/package/bash-completion/bash-completion.mk b/buildroot/package/bash-completion/bash-completion.mk
similarity index 100%
rename from software/package/bash-completion/bash-completion.mk
rename to buildroot/package/bash-completion/bash-completion.mk
diff --git a/software/package/bash/0001-bash50-001.patch b/buildroot/package/bash/0001-bash50-001.patch
similarity index 100%
rename from software/package/bash/0001-bash50-001.patch
rename to buildroot/package/bash/0001-bash50-001.patch
diff --git a/software/package/bash/0002-bash50-002.patch b/buildroot/package/bash/0002-bash50-002.patch
similarity index 100%
rename from software/package/bash/0002-bash50-002.patch
rename to buildroot/package/bash/0002-bash50-002.patch
diff --git a/software/package/bash/0003-bash50-003.patch b/buildroot/package/bash/0003-bash50-003.patch
similarity index 100%
rename from software/package/bash/0003-bash50-003.patch
rename to buildroot/package/bash/0003-bash50-003.patch
diff --git a/software/package/bash/0004-bash50-004.patch b/buildroot/package/bash/0004-bash50-004.patch
similarity index 100%
rename from software/package/bash/0004-bash50-004.patch
rename to buildroot/package/bash/0004-bash50-004.patch
diff --git a/software/package/bash/0005-bash50-005.patch b/buildroot/package/bash/0005-bash50-005.patch
similarity index 100%
rename from software/package/bash/0005-bash50-005.patch
rename to buildroot/package/bash/0005-bash50-005.patch
diff --git a/software/package/bash/0006-bash50-006.patch b/buildroot/package/bash/0006-bash50-006.patch
similarity index 100%
rename from software/package/bash/0006-bash50-006.patch
rename to buildroot/package/bash/0006-bash50-006.patch
diff --git a/software/package/bash/0007-bash50-007.patch b/buildroot/package/bash/0007-bash50-007.patch
similarity index 100%
rename from software/package/bash/0007-bash50-007.patch
rename to buildroot/package/bash/0007-bash50-007.patch
diff --git a/software/package/bash/0008-bash50-008.patch b/buildroot/package/bash/0008-bash50-008.patch
similarity index 100%
rename from software/package/bash/0008-bash50-008.patch
rename to buildroot/package/bash/0008-bash50-008.patch
diff --git a/software/package/bash/0009-bash50-009.patch b/buildroot/package/bash/0009-bash50-009.patch
similarity index 100%
rename from software/package/bash/0009-bash50-009.patch
rename to buildroot/package/bash/0009-bash50-009.patch
diff --git a/software/package/bash/0010-bash50-010.patch b/buildroot/package/bash/0010-bash50-010.patch
similarity index 100%
rename from software/package/bash/0010-bash50-010.patch
rename to buildroot/package/bash/0010-bash50-010.patch
diff --git a/software/package/bash/0011-bash50-011.patch b/buildroot/package/bash/0011-bash50-011.patch
similarity index 100%
rename from software/package/bash/0011-bash50-011.patch
rename to buildroot/package/bash/0011-bash50-011.patch
diff --git a/software/package/bash/0012-bash50-012.patch b/buildroot/package/bash/0012-bash50-012.patch
similarity index 100%
rename from software/package/bash/0012-bash50-012.patch
rename to buildroot/package/bash/0012-bash50-012.patch
diff --git a/software/package/bash/0013-bash50-013.patch b/buildroot/package/bash/0013-bash50-013.patch
similarity index 100%
rename from software/package/bash/0013-bash50-013.patch
rename to buildroot/package/bash/0013-bash50-013.patch
diff --git a/software/package/bash/0014-bash50-014.patch b/buildroot/package/bash/0014-bash50-014.patch
similarity index 100%
rename from software/package/bash/0014-bash50-014.patch
rename to buildroot/package/bash/0014-bash50-014.patch
diff --git a/software/package/bash/0015-bash50-015.patch b/buildroot/package/bash/0015-bash50-015.patch
similarity index 100%
rename from software/package/bash/0015-bash50-015.patch
rename to buildroot/package/bash/0015-bash50-015.patch
diff --git a/software/package/bash/0016-bash50-016.patch b/buildroot/package/bash/0016-bash50-016.patch
similarity index 100%
rename from software/package/bash/0016-bash50-016.patch
rename to buildroot/package/bash/0016-bash50-016.patch
diff --git a/software/package/bash/0017-bash50-017.patch b/buildroot/package/bash/0017-bash50-017.patch
similarity index 100%
rename from software/package/bash/0017-bash50-017.patch
rename to buildroot/package/bash/0017-bash50-017.patch
diff --git a/software/package/bash/0018-bash50-018.patch b/buildroot/package/bash/0018-bash50-018.patch
similarity index 100%
rename from software/package/bash/0018-bash50-018.patch
rename to buildroot/package/bash/0018-bash50-018.patch
diff --git a/software/package/bash/0019-input.h-add-missing-include-on-stdio.h.patch b/buildroot/package/bash/0019-input.h-add-missing-include-on-stdio.h.patch
similarity index 100%
rename from software/package/bash/0019-input.h-add-missing-include-on-stdio.h.patch
rename to buildroot/package/bash/0019-input.h-add-missing-include-on-stdio.h.patch
diff --git a/software/package/bash/0020-locale.c-fix-build-without-wchar.patch b/buildroot/package/bash/0020-locale.c-fix-build-without-wchar.patch
similarity index 100%
rename from software/package/bash/0020-locale.c-fix-build-without-wchar.patch
rename to buildroot/package/bash/0020-locale.c-fix-build-without-wchar.patch
diff --git a/software/package/bash/Config.in b/buildroot/package/bash/Config.in
similarity index 100%
rename from software/package/bash/Config.in
rename to buildroot/package/bash/Config.in
diff --git a/software/package/bash/bash.hash b/buildroot/package/bash/bash.hash
similarity index 100%
rename from software/package/bash/bash.hash
rename to buildroot/package/bash/bash.hash
diff --git a/software/package/bash/bash.mk b/buildroot/package/bash/bash.mk
similarity index 100%
rename from software/package/bash/bash.mk
rename to buildroot/package/bash/bash.mk
diff --git a/software/package/batctl/Config.in b/buildroot/package/batctl/Config.in
similarity index 100%
rename from software/package/batctl/Config.in
rename to buildroot/package/batctl/Config.in
diff --git a/software/package/batctl/batctl.hash b/buildroot/package/batctl/batctl.hash
similarity index 100%
rename from software/package/batctl/batctl.hash
rename to buildroot/package/batctl/batctl.hash
diff --git a/software/package/batctl/batctl.mk b/buildroot/package/batctl/batctl.mk
similarity index 100%
rename from software/package/batctl/batctl.mk
rename to buildroot/package/batctl/batctl.mk
diff --git a/software/package/batman-adv/Config.in b/buildroot/package/batman-adv/Config.in
similarity index 100%
rename from software/package/batman-adv/Config.in
rename to buildroot/package/batman-adv/Config.in
diff --git a/software/package/batman-adv/batman-adv.hash b/buildroot/package/batman-adv/batman-adv.hash
similarity index 100%
rename from software/package/batman-adv/batman-adv.hash
rename to buildroot/package/batman-adv/batman-adv.hash
diff --git a/software/package/batman-adv/batman-adv.mk b/buildroot/package/batman-adv/batman-adv.mk
similarity index 100%
rename from software/package/batman-adv/batman-adv.mk
rename to buildroot/package/batman-adv/batman-adv.mk
diff --git a/software/package/bats-core/Config.in b/buildroot/package/bats-core/Config.in
similarity index 100%
rename from software/package/bats-core/Config.in
rename to buildroot/package/bats-core/Config.in
diff --git a/software/package/bats-core/bats-core.hash b/buildroot/package/bats-core/bats-core.hash
similarity index 100%
rename from software/package/bats-core/bats-core.hash
rename to buildroot/package/bats-core/bats-core.hash
diff --git a/software/package/bats-core/bats-core.mk b/buildroot/package/bats-core/bats-core.mk
similarity index 100%
rename from software/package/bats-core/bats-core.mk
rename to buildroot/package/bats-core/bats-core.mk
diff --git a/software/package/bayer2rgb-neon/Config.in b/buildroot/package/bayer2rgb-neon/Config.in
similarity index 100%
rename from software/package/bayer2rgb-neon/Config.in
rename to buildroot/package/bayer2rgb-neon/Config.in
diff --git a/software/package/bayer2rgb-neon/bayer2rgb-neon.hash b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash
similarity index 100%
rename from software/package/bayer2rgb-neon/bayer2rgb-neon.hash
rename to buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash
diff --git a/software/package/bayer2rgb-neon/bayer2rgb-neon.mk b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.mk
similarity index 100%
rename from software/package/bayer2rgb-neon/bayer2rgb-neon.mk
rename to buildroot/package/bayer2rgb-neon/bayer2rgb-neon.mk
diff --git a/software/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch b/buildroot/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch
similarity index 100%
rename from software/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch
rename to buildroot/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch
diff --git a/software/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch b/buildroot/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch
similarity index 100%
rename from software/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch
rename to buildroot/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch
diff --git a/software/package/bc/0003-dc-fix-exit-code-of-q-command.patch b/buildroot/package/bc/0003-dc-fix-exit-code-of-q-command.patch
similarity index 100%
rename from software/package/bc/0003-dc-fix-exit-code-of-q-command.patch
rename to buildroot/package/bc/0003-dc-fix-exit-code-of-q-command.patch
diff --git a/software/package/bc/0004-no-gen-libmath.patch b/buildroot/package/bc/0004-no-gen-libmath.patch
similarity index 100%
rename from software/package/bc/0004-no-gen-libmath.patch
rename to buildroot/package/bc/0004-no-gen-libmath.patch
diff --git a/software/package/bc/Config.in b/buildroot/package/bc/Config.in
similarity index 100%
rename from software/package/bc/Config.in
rename to buildroot/package/bc/Config.in
diff --git a/software/package/bc/bc.hash b/buildroot/package/bc/bc.hash
similarity index 100%
rename from software/package/bc/bc.hash
rename to buildroot/package/bc/bc.hash
diff --git a/software/package/bc/bc.mk b/buildroot/package/bc/bc.mk
similarity index 100%
rename from software/package/bc/bc.mk
rename to buildroot/package/bc/bc.mk
diff --git a/software/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch b/buildroot/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch
similarity index 100%
rename from software/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch
rename to buildroot/package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch
diff --git a/software/package/bcache-tools/Config.in b/buildroot/package/bcache-tools/Config.in
similarity index 100%
rename from software/package/bcache-tools/Config.in
rename to buildroot/package/bcache-tools/Config.in
diff --git a/software/package/bcache-tools/bcache-tools.hash b/buildroot/package/bcache-tools/bcache-tools.hash
similarity index 100%
rename from software/package/bcache-tools/bcache-tools.hash
rename to buildroot/package/bcache-tools/bcache-tools.hash
diff --git a/software/package/bcache-tools/bcache-tools.mk b/buildroot/package/bcache-tools/bcache-tools.mk
similarity index 100%
rename from software/package/bcache-tools/bcache-tools.mk
rename to buildroot/package/bcache-tools/bcache-tools.mk
diff --git a/software/package/bcg729/Config.in b/buildroot/package/bcg729/Config.in
similarity index 100%
rename from software/package/bcg729/Config.in
rename to buildroot/package/bcg729/Config.in
diff --git a/software/package/bcg729/bcg729.hash b/buildroot/package/bcg729/bcg729.hash
similarity index 100%
rename from software/package/bcg729/bcg729.hash
rename to buildroot/package/bcg729/bcg729.hash
diff --git a/software/package/bcg729/bcg729.mk b/buildroot/package/bcg729/bcg729.mk
similarity index 100%
rename from software/package/bcg729/bcg729.mk
rename to buildroot/package/bcg729/bcg729.mk
diff --git a/software/package/bcm2835/Config.in b/buildroot/package/bcm2835/Config.in
similarity index 100%
rename from software/package/bcm2835/Config.in
rename to buildroot/package/bcm2835/Config.in
diff --git a/software/package/bcm2835/bcm2835.hash b/buildroot/package/bcm2835/bcm2835.hash
similarity index 100%
rename from software/package/bcm2835/bcm2835.hash
rename to buildroot/package/bcm2835/bcm2835.hash
diff --git a/software/package/bcm2835/bcm2835.mk b/buildroot/package/bcm2835/bcm2835.mk
similarity index 100%
rename from software/package/bcm2835/bcm2835.mk
rename to buildroot/package/bcm2835/bcm2835.mk
diff --git a/software/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/buildroot/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
similarity index 100%
rename from software/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
rename to buildroot/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
diff --git a/software/package/bctoolbox/Config.in b/buildroot/package/bctoolbox/Config.in
similarity index 100%
rename from software/package/bctoolbox/Config.in
rename to buildroot/package/bctoolbox/Config.in
diff --git a/software/package/bctoolbox/bctoolbox.hash b/buildroot/package/bctoolbox/bctoolbox.hash
similarity index 100%
rename from software/package/bctoolbox/bctoolbox.hash
rename to buildroot/package/bctoolbox/bctoolbox.hash
diff --git a/software/package/bctoolbox/bctoolbox.mk b/buildroot/package/bctoolbox/bctoolbox.mk
similarity index 100%
rename from software/package/bctoolbox/bctoolbox.mk
rename to buildroot/package/bctoolbox/bctoolbox.mk
diff --git a/software/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch b/buildroot/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch
similarity index 100%
rename from software/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch
rename to buildroot/package/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch
diff --git a/software/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch b/buildroot/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch
similarity index 100%
rename from software/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch
rename to buildroot/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch
diff --git a/software/package/bcusdk/Config.in b/buildroot/package/bcusdk/Config.in
similarity index 100%
rename from software/package/bcusdk/Config.in
rename to buildroot/package/bcusdk/Config.in
diff --git a/software/package/bcusdk/bcusdk.hash b/buildroot/package/bcusdk/bcusdk.hash
similarity index 100%
rename from software/package/bcusdk/bcusdk.hash
rename to buildroot/package/bcusdk/bcusdk.hash
diff --git a/software/package/bcusdk/bcusdk.mk b/buildroot/package/bcusdk/bcusdk.mk
similarity index 100%
rename from software/package/bcusdk/bcusdk.mk
rename to buildroot/package/bcusdk/bcusdk.mk
diff --git a/software/package/bdwgc/Config.in b/buildroot/package/bdwgc/Config.in
similarity index 100%
rename from software/package/bdwgc/Config.in
rename to buildroot/package/bdwgc/Config.in
diff --git a/software/package/bdwgc/bdwgc.hash b/buildroot/package/bdwgc/bdwgc.hash
similarity index 100%
rename from software/package/bdwgc/bdwgc.hash
rename to buildroot/package/bdwgc/bdwgc.hash
diff --git a/software/package/bdwgc/bdwgc.mk b/buildroot/package/bdwgc/bdwgc.mk
similarity index 100%
rename from software/package/bdwgc/bdwgc.mk
rename to buildroot/package/bdwgc/bdwgc.mk
diff --git a/software/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch b/buildroot/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch
similarity index 100%
rename from software/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch
rename to buildroot/package/beecrypt/0001-cppglue.cxx-cplusplus-only.patch
diff --git a/software/package/beecrypt/0002-build-system.patch b/buildroot/package/beecrypt/0002-build-system.patch
similarity index 100%
rename from software/package/beecrypt/0002-build-system.patch
rename to buildroot/package/beecrypt/0002-build-system.patch
diff --git a/software/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch b/buildroot/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch
similarity index 100%
rename from software/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch
rename to buildroot/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch
diff --git a/software/package/beecrypt/Config.in b/buildroot/package/beecrypt/Config.in
similarity index 100%
rename from software/package/beecrypt/Config.in
rename to buildroot/package/beecrypt/Config.in
diff --git a/software/package/beecrypt/beecrypt.hash b/buildroot/package/beecrypt/beecrypt.hash
similarity index 100%
rename from software/package/beecrypt/beecrypt.hash
rename to buildroot/package/beecrypt/beecrypt.hash
diff --git a/software/package/beecrypt/beecrypt.mk b/buildroot/package/beecrypt/beecrypt.mk
similarity index 100%
rename from software/package/beecrypt/beecrypt.mk
rename to buildroot/package/beecrypt/beecrypt.mk
diff --git a/software/package/bellagio/0001-drop-werror.patch b/buildroot/package/bellagio/0001-drop-werror.patch
similarity index 100%
rename from software/package/bellagio/0001-drop-werror.patch
rename to buildroot/package/bellagio/0001-drop-werror.patch
diff --git a/software/package/bellagio/0002-dynamicloader-linking.patch b/buildroot/package/bellagio/0002-dynamicloader-linking.patch
similarity index 100%
rename from software/package/bellagio/0002-dynamicloader-linking.patch
rename to buildroot/package/bellagio/0002-dynamicloader-linking.patch
diff --git a/software/package/bellagio/0003-parallel-build.patch b/buildroot/package/bellagio/0003-parallel-build.patch
similarity index 100%
rename from software/package/bellagio/0003-parallel-build.patch
rename to buildroot/package/bellagio/0003-parallel-build.patch
diff --git a/software/package/bellagio/0004-segfault-on-removeFromWaitResource.patch b/buildroot/package/bellagio/0004-segfault-on-removeFromWaitResource.patch
similarity index 100%
rename from software/package/bellagio/0004-segfault-on-removeFromWaitResource.patch
rename to buildroot/package/bellagio/0004-segfault-on-removeFromWaitResource.patch
diff --git a/software/package/bellagio/0005-fix-doc-installation-path.patch b/buildroot/package/bellagio/0005-fix-doc-installation-path.patch
similarity index 100%
rename from software/package/bellagio/0005-fix-doc-installation-path.patch
rename to buildroot/package/bellagio/0005-fix-doc-installation-path.patch
diff --git a/software/package/bellagio/Config.in b/buildroot/package/bellagio/Config.in
similarity index 100%
rename from software/package/bellagio/Config.in
rename to buildroot/package/bellagio/Config.in
diff --git a/software/package/bellagio/bellagio.hash b/buildroot/package/bellagio/bellagio.hash
similarity index 100%
rename from software/package/bellagio/bellagio.hash
rename to buildroot/package/bellagio/bellagio.hash
diff --git a/software/package/bellagio/bellagio.mk b/buildroot/package/bellagio/bellagio.mk
similarity index 100%
rename from software/package/bellagio/bellagio.mk
rename to buildroot/package/bellagio/bellagio.mk
diff --git a/software/package/benejson/0001-c-std.patch b/buildroot/package/benejson/0001-c-std.patch
similarity index 100%
rename from software/package/benejson/0001-c-std.patch
rename to buildroot/package/benejson/0001-c-std.patch
diff --git a/software/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch b/buildroot/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch
similarity index 100%
rename from software/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch
rename to buildroot/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch
diff --git a/software/package/benejson/Config.in b/buildroot/package/benejson/Config.in
similarity index 100%
rename from software/package/benejson/Config.in
rename to buildroot/package/benejson/Config.in
diff --git a/software/package/benejson/benejson.hash b/buildroot/package/benejson/benejson.hash
similarity index 100%
rename from software/package/benejson/benejson.hash
rename to buildroot/package/benejson/benejson.hash
diff --git a/software/package/benejson/benejson.mk b/buildroot/package/benejson/benejson.mk
similarity index 100%
rename from software/package/benejson/benejson.mk
rename to buildroot/package/benejson/benejson.mk
diff --git a/software/package/berkeleydb/0001-cwd-db_config.patch b/buildroot/package/berkeleydb/0001-cwd-db_config.patch
similarity index 100%
rename from software/package/berkeleydb/0001-cwd-db_config.patch
rename to buildroot/package/berkeleydb/0001-cwd-db_config.patch
diff --git a/software/package/berkeleydb/0002-atomic_compare_exchange.patch b/buildroot/package/berkeleydb/0002-atomic_compare_exchange.patch
similarity index 100%
rename from software/package/berkeleydb/0002-atomic_compare_exchange.patch
rename to buildroot/package/berkeleydb/0002-atomic_compare_exchange.patch
diff --git a/software/package/berkeleydb/Config.in b/buildroot/package/berkeleydb/Config.in
similarity index 100%
rename from software/package/berkeleydb/Config.in
rename to buildroot/package/berkeleydb/Config.in
diff --git a/software/package/berkeleydb/berkeleydb.hash b/buildroot/package/berkeleydb/berkeleydb.hash
similarity index 100%
rename from software/package/berkeleydb/berkeleydb.hash
rename to buildroot/package/berkeleydb/berkeleydb.hash
diff --git a/software/package/berkeleydb/berkeleydb.mk b/buildroot/package/berkeleydb/berkeleydb.mk
similarity index 100%
rename from software/package/berkeleydb/berkeleydb.mk
rename to buildroot/package/berkeleydb/berkeleydb.mk
diff --git a/software/package/bind/0001-cross.patch b/buildroot/package/bind/0001-cross.patch
similarity index 100%
rename from software/package/bind/0001-cross.patch
rename to buildroot/package/bind/0001-cross.patch
diff --git a/software/package/bind/Config.in b/buildroot/package/bind/Config.in
similarity index 100%
rename from software/package/bind/Config.in
rename to buildroot/package/bind/Config.in
diff --git a/software/package/bind/S81named b/buildroot/package/bind/S81named
similarity index 100%
rename from software/package/bind/S81named
rename to buildroot/package/bind/S81named
diff --git a/software/package/bind/bind.hash b/buildroot/package/bind/bind.hash
similarity index 100%
rename from software/package/bind/bind.hash
rename to buildroot/package/bind/bind.hash
diff --git a/software/package/bind/bind.mk b/buildroot/package/bind/bind.mk
similarity index 100%
rename from software/package/bind/bind.mk
rename to buildroot/package/bind/bind.mk
diff --git a/software/package/bind/named.service b/buildroot/package/bind/named.service
similarity index 100%
rename from software/package/bind/named.service
rename to buildroot/package/bind/named.service
diff --git a/software/package/binutils/2.31.1/0001-sh-conf.patch b/buildroot/package/binutils/2.31.1/0001-sh-conf.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0001-sh-conf.patch
rename to buildroot/package/binutils/2.31.1/0001-sh-conf.patch
diff --git a/software/package/binutils/2.31.1/0005-poison-system-directories.patch b/buildroot/package/binutils/2.31.1/0005-poison-system-directories.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0005-poison-system-directories.patch
rename to buildroot/package/binutils/2.31.1/0005-poison-system-directories.patch
diff --git a/software/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch b/buildroot/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch
rename to buildroot/package/binutils/2.31.1/0006-Refactored-location-where-GOT-information-is-collect.patch
diff --git a/software/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch b/buildroot/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch
rename to buildroot/package/binutils/2.31.1/0007-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch
diff --git a/software/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch b/buildroot/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch
rename to buildroot/package/binutils/2.31.1/0008-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch
diff --git a/software/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch b/buildroot/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch
rename to buildroot/package/binutils/2.31.1/0009-PLT-information-was-still-being-generated-when-symbo.patch
diff --git a/software/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch b/buildroot/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch
rename to buildroot/package/binutils/2.31.1/0010-xtensa-fix-relaxation-of-undefined-weak-references-i.patch
diff --git a/software/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch b/buildroot/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch
rename to buildroot/package/binutils/2.31.1/0011-xtensa-move-dynamic-relocations-sections-consistency.patch
diff --git a/software/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
rename to buildroot/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
diff --git a/software/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
rename to buildroot/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
diff --git a/software/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
rename to buildroot/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
diff --git a/software/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch b/buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
rename to buildroot/package/binutils/2.31.1/0015-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
diff --git a/software/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
rename to buildroot/package/binutils/2.31.1/0016-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
diff --git a/software/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch b/buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch
rename to buildroot/package/binutils/2.31.1/0017-xtensa-gas-put-.literal_position-at-section-start.patch
diff --git a/software/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch
rename to buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch
diff --git a/software/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch
rename to buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch
diff --git a/software/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
similarity index 100%
rename from software/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
rename to buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
diff --git a/software/package/binutils/2.32/0001-sh-conf.patch b/buildroot/package/binutils/2.32/0001-sh-conf.patch
similarity index 100%
rename from software/package/binutils/2.32/0001-sh-conf.patch
rename to buildroot/package/binutils/2.32/0001-sh-conf.patch
diff --git a/software/package/binutils/2.32/0002-poison-system-directories.patch b/buildroot/package/binutils/2.32/0002-poison-system-directories.patch
similarity index 100%
rename from software/package/binutils/2.32/0002-poison-system-directories.patch
rename to buildroot/package/binutils/2.32/0002-poison-system-directories.patch
diff --git a/software/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch b/buildroot/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
similarity index 100%
rename from software/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
rename to buildroot/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch
diff --git a/software/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/buildroot/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
similarity index 100%
rename from software/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
rename to buildroot/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch
diff --git a/software/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch b/buildroot/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch
similarity index 100%
rename from software/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch
rename to buildroot/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch
diff --git a/software/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch b/buildroot/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch
similarity index 100%
rename from software/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch
rename to buildroot/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch
diff --git a/software/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch
similarity index 100%
rename from software/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch
rename to buildroot/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch
diff --git a/software/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch
similarity index 100%
rename from software/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch
rename to buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch
diff --git a/software/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
similarity index 100%
rename from software/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
rename to buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
diff --git a/software/package/binutils/2.33.1/0001-sh-conf.patch b/buildroot/package/binutils/2.33.1/0001-sh-conf.patch
similarity index 100%
rename from software/package/binutils/2.33.1/0001-sh-conf.patch
rename to buildroot/package/binutils/2.33.1/0001-sh-conf.patch
diff --git a/software/package/binutils/2.33.1/0002-poison-system-directories.patch b/buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch
similarity index 100%
rename from software/package/binutils/2.33.1/0002-poison-system-directories.patch
rename to buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch
diff --git a/software/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch b/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch
similarity index 100%
rename from software/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch
rename to buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch
diff --git a/software/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch
similarity index 100%
rename from software/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch
rename to buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch
diff --git a/software/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch
similarity index 100%
rename from software/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch
rename to buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch
diff --git a/software/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
similarity index 100%
rename from software/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
rename to buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch
diff --git a/software/package/binutils/Config.in b/buildroot/package/binutils/Config.in
similarity index 100%
rename from software/package/binutils/Config.in
rename to buildroot/package/binutils/Config.in
diff --git a/software/package/binutils/Config.in.host b/buildroot/package/binutils/Config.in.host
similarity index 100%
rename from software/package/binutils/Config.in.host
rename to buildroot/package/binutils/Config.in.host
diff --git a/software/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch b/buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch
similarity index 100%
rename from software/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch
rename to buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch
diff --git a/software/package/binutils/binutils.hash b/buildroot/package/binutils/binutils.hash
similarity index 100%
rename from software/package/binutils/binutils.hash
rename to buildroot/package/binutils/binutils.hash
diff --git a/software/package/binutils/binutils.mk b/buildroot/package/binutils/binutils.mk
similarity index 100%
rename from software/package/binutils/binutils.mk
rename to buildroot/package/binutils/binutils.mk
diff --git a/software/package/biosdevname/Config.in b/buildroot/package/biosdevname/Config.in
similarity index 100%
rename from software/package/biosdevname/Config.in
rename to buildroot/package/biosdevname/Config.in
diff --git a/software/package/biosdevname/biosdevname.hash b/buildroot/package/biosdevname/biosdevname.hash
similarity index 100%
rename from software/package/biosdevname/biosdevname.hash
rename to buildroot/package/biosdevname/biosdevname.hash
diff --git a/software/package/biosdevname/biosdevname.mk b/buildroot/package/biosdevname/biosdevname.mk
similarity index 100%
rename from software/package/biosdevname/biosdevname.mk
rename to buildroot/package/biosdevname/biosdevname.mk
diff --git a/software/package/bird/0001-Nest-Fix-build-without-protocols.patch b/buildroot/package/bird/0001-Nest-Fix-build-without-protocols.patch
similarity index 100%
rename from software/package/bird/0001-Nest-Fix-build-without-protocols.patch
rename to buildroot/package/bird/0001-Nest-Fix-build-without-protocols.patch
diff --git a/software/package/bird/Config.in b/buildroot/package/bird/Config.in
similarity index 100%
rename from software/package/bird/Config.in
rename to buildroot/package/bird/Config.in
diff --git a/software/package/bird/bird.hash b/buildroot/package/bird/bird.hash
similarity index 100%
rename from software/package/bird/bird.hash
rename to buildroot/package/bird/bird.hash
diff --git a/software/package/bird/bird.mk b/buildroot/package/bird/bird.mk
similarity index 100%
rename from software/package/bird/bird.mk
rename to buildroot/package/bird/bird.mk
diff --git a/software/package/bison/0001-src-make-path-to-m4-relocatable.patch b/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch
similarity index 100%
rename from software/package/bison/0001-src-make-path-to-m4-relocatable.patch
rename to buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch
diff --git a/software/package/bison/bison.hash b/buildroot/package/bison/bison.hash
similarity index 100%
rename from software/package/bison/bison.hash
rename to buildroot/package/bison/bison.hash
diff --git a/software/package/bison/bison.mk b/buildroot/package/bison/bison.mk
similarity index 100%
rename from software/package/bison/bison.mk
rename to buildroot/package/bison/bison.mk
diff --git a/software/package/bitcoin/Config.in b/buildroot/package/bitcoin/Config.in
similarity index 100%
rename from software/package/bitcoin/Config.in
rename to buildroot/package/bitcoin/Config.in
diff --git a/software/package/bitcoin/bitcoin.hash b/buildroot/package/bitcoin/bitcoin.hash
similarity index 100%
rename from software/package/bitcoin/bitcoin.hash
rename to buildroot/package/bitcoin/bitcoin.hash
diff --git a/software/package/bitcoin/bitcoin.mk b/buildroot/package/bitcoin/bitcoin.mk
similarity index 100%
rename from software/package/bitcoin/bitcoin.mk
rename to buildroot/package/bitcoin/bitcoin.mk
diff --git a/software/package/bitstream-vera/Config.in b/buildroot/package/bitstream-vera/Config.in
similarity index 100%
rename from software/package/bitstream-vera/Config.in
rename to buildroot/package/bitstream-vera/Config.in
diff --git a/software/package/bitstream-vera/bitstream-vera.hash b/buildroot/package/bitstream-vera/bitstream-vera.hash
similarity index 100%
rename from software/package/bitstream-vera/bitstream-vera.hash
rename to buildroot/package/bitstream-vera/bitstream-vera.hash
diff --git a/software/package/bitstream-vera/bitstream-vera.mk b/buildroot/package/bitstream-vera/bitstream-vera.mk
similarity index 100%
rename from software/package/bitstream-vera/bitstream-vera.mk
rename to buildroot/package/bitstream-vera/bitstream-vera.mk
diff --git a/software/package/bitstream/Config.in b/buildroot/package/bitstream/Config.in
similarity index 100%
rename from software/package/bitstream/Config.in
rename to buildroot/package/bitstream/Config.in
diff --git a/software/package/bitstream/bitstream.hash b/buildroot/package/bitstream/bitstream.hash
similarity index 100%
rename from software/package/bitstream/bitstream.hash
rename to buildroot/package/bitstream/bitstream.hash
diff --git a/software/package/bitstream/bitstream.mk b/buildroot/package/bitstream/bitstream.mk
similarity index 100%
rename from software/package/bitstream/bitstream.mk
rename to buildroot/package/bitstream/bitstream.mk
diff --git a/software/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch b/buildroot/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch
similarity index 100%
rename from software/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch
rename to buildroot/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch
diff --git a/software/package/blktrace/Config.in b/buildroot/package/blktrace/Config.in
similarity index 100%
rename from software/package/blktrace/Config.in
rename to buildroot/package/blktrace/Config.in
diff --git a/software/package/blktrace/blktrace.hash b/buildroot/package/blktrace/blktrace.hash
similarity index 100%
rename from software/package/blktrace/blktrace.hash
rename to buildroot/package/blktrace/blktrace.hash
diff --git a/software/package/blktrace/blktrace.mk b/buildroot/package/blktrace/blktrace.mk
similarity index 100%
rename from software/package/blktrace/blktrace.mk
rename to buildroot/package/blktrace/blktrace.mk
diff --git a/software/package/bluez-alsa/Config.in b/buildroot/package/bluez-alsa/Config.in
similarity index 100%
rename from software/package/bluez-alsa/Config.in
rename to buildroot/package/bluez-alsa/Config.in
diff --git a/software/package/bluez-alsa/bluez-alsa.hash b/buildroot/package/bluez-alsa/bluez-alsa.hash
similarity index 100%
rename from software/package/bluez-alsa/bluez-alsa.hash
rename to buildroot/package/bluez-alsa/bluez-alsa.hash
diff --git a/software/package/bluez-alsa/bluez-alsa.mk b/buildroot/package/bluez-alsa/bluez-alsa.mk
similarity index 100%
rename from software/package/bluez-alsa/bluez-alsa.mk
rename to buildroot/package/bluez-alsa/bluez-alsa.mk
diff --git a/software/package/bluez-tools/Config.in b/buildroot/package/bluez-tools/Config.in
similarity index 100%
rename from software/package/bluez-tools/Config.in
rename to buildroot/package/bluez-tools/Config.in
diff --git a/software/package/bluez-tools/bluez-tools.hash b/buildroot/package/bluez-tools/bluez-tools.hash
similarity index 100%
rename from software/package/bluez-tools/bluez-tools.hash
rename to buildroot/package/bluez-tools/bluez-tools.hash
diff --git a/software/package/bluez-tools/bluez-tools.mk b/buildroot/package/bluez-tools/bluez-tools.mk
similarity index 100%
rename from software/package/bluez-tools/bluez-tools.mk
rename to buildroot/package/bluez-tools/bluez-tools.mk
diff --git a/software/package/bluez5_utils-headers/Config.in b/buildroot/package/bluez5_utils-headers/Config.in
similarity index 100%
rename from software/package/bluez5_utils-headers/Config.in
rename to buildroot/package/bluez5_utils-headers/Config.in
diff --git a/software/package/bluez5_utils-headers/bluez5_utils-headers.hash b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.hash
similarity index 100%
rename from software/package/bluez5_utils-headers/bluez5_utils-headers.hash
rename to buildroot/package/bluez5_utils-headers/bluez5_utils-headers.hash
diff --git a/software/package/bluez5_utils-headers/bluez5_utils-headers.mk b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk
similarity index 100%
rename from software/package/bluez5_utils-headers/bluez5_utils-headers.mk
rename to buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk
diff --git a/software/package/bluez5_utils/Config.in b/buildroot/package/bluez5_utils/Config.in
similarity index 100%
rename from software/package/bluez5_utils/Config.in
rename to buildroot/package/bluez5_utils/Config.in
diff --git a/software/package/bluez5_utils/bluez5_utils.hash b/buildroot/package/bluez5_utils/bluez5_utils.hash
similarity index 100%
rename from software/package/bluez5_utils/bluez5_utils.hash
rename to buildroot/package/bluez5_utils/bluez5_utils.hash
diff --git a/software/package/bluez5_utils/bluez5_utils.mk b/buildroot/package/bluez5_utils/bluez5_utils.mk
similarity index 100%
rename from software/package/bluez5_utils/bluez5_utils.mk
rename to buildroot/package/bluez5_utils/bluez5_utils.mk
diff --git a/software/package/bmon/Config.in b/buildroot/package/bmon/Config.in
similarity index 100%
rename from software/package/bmon/Config.in
rename to buildroot/package/bmon/Config.in
diff --git a/software/package/bmon/bmon.hash b/buildroot/package/bmon/bmon.hash
similarity index 100%
rename from software/package/bmon/bmon.hash
rename to buildroot/package/bmon/bmon.hash
diff --git a/software/package/bmon/bmon.mk b/buildroot/package/bmon/bmon.mk
similarity index 100%
rename from software/package/bmon/bmon.mk
rename to buildroot/package/bmon/bmon.mk
diff --git a/software/package/boa/0001-use-name-max.patch b/buildroot/package/boa/0001-use-name-max.patch
similarity index 100%
rename from software/package/boa/0001-use-name-max.patch
rename to buildroot/package/boa/0001-use-name-max.patch
diff --git a/software/package/boa/Config.in b/buildroot/package/boa/Config.in
similarity index 100%
rename from software/package/boa/Config.in
rename to buildroot/package/boa/Config.in
diff --git a/software/package/boa/boa.conf b/buildroot/package/boa/boa.conf
similarity index 100%
rename from software/package/boa/boa.conf
rename to buildroot/package/boa/boa.conf
diff --git a/software/package/boa/boa.hash b/buildroot/package/boa/boa.hash
similarity index 100%
rename from software/package/boa/boa.hash
rename to buildroot/package/boa/boa.hash
diff --git a/software/package/boa/boa.mk b/buildroot/package/boa/boa.mk
similarity index 100%
rename from software/package/boa/boa.mk
rename to buildroot/package/boa/boa.mk
diff --git a/software/package/boa/mime.types b/buildroot/package/boa/mime.types
similarity index 100%
rename from software/package/boa/mime.types
rename to buildroot/package/boa/mime.types
diff --git a/software/package/boinc/Config.in b/buildroot/package/boinc/Config.in
similarity index 100%
rename from software/package/boinc/Config.in
rename to buildroot/package/boinc/Config.in
diff --git a/software/package/boinc/S99boinc-client b/buildroot/package/boinc/S99boinc-client
similarity index 100%
rename from software/package/boinc/S99boinc-client
rename to buildroot/package/boinc/S99boinc-client
diff --git a/software/package/boinc/boinc.hash b/buildroot/package/boinc/boinc.hash
similarity index 100%
rename from software/package/boinc/boinc.hash
rename to buildroot/package/boinc/boinc.hash
diff --git a/software/package/boinc/boinc.mk b/buildroot/package/boinc/boinc.mk
similarity index 100%
rename from software/package/boinc/boinc.mk
rename to buildroot/package/boinc/boinc.mk
diff --git a/software/package/bonnie/Config.in b/buildroot/package/bonnie/Config.in
similarity index 100%
rename from software/package/bonnie/Config.in
rename to buildroot/package/bonnie/Config.in
diff --git a/software/package/bonnie/bonnie.hash b/buildroot/package/bonnie/bonnie.hash
similarity index 100%
rename from software/package/bonnie/bonnie.hash
rename to buildroot/package/bonnie/bonnie.hash
diff --git a/software/package/bonnie/bonnie.mk b/buildroot/package/bonnie/bonnie.mk
similarity index 100%
rename from software/package/bonnie/bonnie.mk
rename to buildroot/package/bonnie/bonnie.mk
diff --git a/software/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch b/buildroot/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
similarity index 100%
rename from software/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
rename to buildroot/package/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch
diff --git a/software/package/boost/0002-fix-uclibc-eventfd.patch b/buildroot/package/boost/0002-fix-uclibc-eventfd.patch
similarity index 100%
rename from software/package/boost/0002-fix-uclibc-eventfd.patch
rename to buildroot/package/boost/0002-fix-uclibc-eventfd.patch
diff --git a/software/package/boost/0003-fenv.patch b/buildroot/package/boost/0003-fenv.patch
similarity index 100%
rename from software/package/boost/0003-fenv.patch
rename to buildroot/package/boost/0003-fenv.patch
diff --git a/software/package/boost/0004-add-riscv-endian-detection.patch b/buildroot/package/boost/0004-add-riscv-endian-detection.patch
similarity index 100%
rename from software/package/boost/0004-add-riscv-endian-detection.patch
rename to buildroot/package/boost/0004-add-riscv-endian-detection.patch
diff --git a/software/package/boost/Config.in b/buildroot/package/boost/Config.in
similarity index 100%
rename from software/package/boost/Config.in
rename to buildroot/package/boost/Config.in
diff --git a/software/package/boost/boost.hash b/buildroot/package/boost/boost.hash
similarity index 100%
rename from software/package/boost/boost.hash
rename to buildroot/package/boost/boost.hash
diff --git a/software/package/boost/boost.mk b/buildroot/package/boost/boost.mk
similarity index 100%
rename from software/package/boost/boost.mk
rename to buildroot/package/boost/boost.mk
diff --git a/software/package/bootstrap/Config.in b/buildroot/package/bootstrap/Config.in
similarity index 100%
rename from software/package/bootstrap/Config.in
rename to buildroot/package/bootstrap/Config.in
diff --git a/software/package/bootstrap/bootstrap.hash b/buildroot/package/bootstrap/bootstrap.hash
similarity index 100%
rename from software/package/bootstrap/bootstrap.hash
rename to buildroot/package/bootstrap/bootstrap.hash
diff --git a/software/package/bootstrap/bootstrap.mk b/buildroot/package/bootstrap/bootstrap.mk
similarity index 100%
rename from software/package/bootstrap/bootstrap.mk
rename to buildroot/package/bootstrap/bootstrap.mk
diff --git a/software/package/botan/Config.in b/buildroot/package/botan/Config.in
similarity index 100%
rename from software/package/botan/Config.in
rename to buildroot/package/botan/Config.in
diff --git a/software/package/botan/botan.hash b/buildroot/package/botan/botan.hash
similarity index 100%
rename from software/package/botan/botan.hash
rename to buildroot/package/botan/botan.hash
diff --git a/software/package/botan/botan.mk b/buildroot/package/botan/botan.mk
similarity index 100%
rename from software/package/botan/botan.mk
rename to buildroot/package/botan/botan.mk
diff --git a/software/package/brcm-patchram-plus/Config.in b/buildroot/package/brcm-patchram-plus/Config.in
similarity index 100%
rename from software/package/brcm-patchram-plus/Config.in
rename to buildroot/package/brcm-patchram-plus/Config.in
diff --git a/software/package/brcm-patchram-plus/brcm-patchram-plus.hash b/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.hash
similarity index 100%
rename from software/package/brcm-patchram-plus/brcm-patchram-plus.hash
rename to buildroot/package/brcm-patchram-plus/brcm-patchram-plus.hash
diff --git a/software/package/brcm-patchram-plus/brcm-patchram-plus.mk b/buildroot/package/brcm-patchram-plus/brcm-patchram-plus.mk
similarity index 100%
rename from software/package/brcm-patchram-plus/brcm-patchram-plus.mk
rename to buildroot/package/brcm-patchram-plus/brcm-patchram-plus.mk
diff --git a/software/package/brickd/Config.in b/buildroot/package/brickd/Config.in
similarity index 100%
rename from software/package/brickd/Config.in
rename to buildroot/package/brickd/Config.in
diff --git a/software/package/brickd/S70brickd b/buildroot/package/brickd/S70brickd
similarity index 100%
rename from software/package/brickd/S70brickd
rename to buildroot/package/brickd/S70brickd
diff --git a/software/package/brickd/brickd.hash b/buildroot/package/brickd/brickd.hash
similarity index 100%
rename from software/package/brickd/brickd.hash
rename to buildroot/package/brickd/brickd.hash
diff --git a/software/package/brickd/brickd.mk b/buildroot/package/brickd/brickd.mk
similarity index 100%
rename from software/package/brickd/brickd.mk
rename to buildroot/package/brickd/brickd.mk
diff --git a/software/package/bridge-utils/0001-build-system.patch b/buildroot/package/bridge-utils/0001-build-system.patch
similarity index 100%
rename from software/package/bridge-utils/0001-build-system.patch
rename to buildroot/package/bridge-utils/0001-build-system.patch
diff --git a/software/package/bridge-utils/Config.in b/buildroot/package/bridge-utils/Config.in
similarity index 100%
rename from software/package/bridge-utils/Config.in
rename to buildroot/package/bridge-utils/Config.in
diff --git a/software/package/bridge-utils/bridge-utils.hash b/buildroot/package/bridge-utils/bridge-utils.hash
similarity index 100%
rename from software/package/bridge-utils/bridge-utils.hash
rename to buildroot/package/bridge-utils/bridge-utils.hash
diff --git a/software/package/bridge-utils/bridge-utils.mk b/buildroot/package/bridge-utils/bridge-utils.mk
similarity index 100%
rename from software/package/bridge-utils/bridge-utils.mk
rename to buildroot/package/bridge-utils/bridge-utils.mk
diff --git a/software/package/brltty/0001-Fix-linking-error-on-mips64el.patch b/buildroot/package/brltty/0001-Fix-linking-error-on-mips64el.patch
similarity index 100%
rename from software/package/brltty/0001-Fix-linking-error-on-mips64el.patch
rename to buildroot/package/brltty/0001-Fix-linking-error-on-mips64el.patch
diff --git a/software/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch b/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch
similarity index 100%
rename from software/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch
rename to buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch
diff --git a/software/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch b/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch
similarity index 100%
rename from software/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch
rename to buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch
diff --git a/software/package/brltty/Config.in b/buildroot/package/brltty/Config.in
similarity index 100%
rename from software/package/brltty/Config.in
rename to buildroot/package/brltty/Config.in
diff --git a/software/package/brltty/S10brltty b/buildroot/package/brltty/S10brltty
similarity index 100%
rename from software/package/brltty/S10brltty
rename to buildroot/package/brltty/S10brltty
diff --git a/software/package/brltty/brltty.hash b/buildroot/package/brltty/brltty.hash
similarity index 100%
rename from software/package/brltty/brltty.hash
rename to buildroot/package/brltty/brltty.hash
diff --git a/software/package/brltty/brltty.mk b/buildroot/package/brltty/brltty.mk
similarity index 100%
rename from software/package/brltty/brltty.mk
rename to buildroot/package/brltty/brltty.mk
diff --git a/software/package/brltty/brltty.service b/buildroot/package/brltty/brltty.service
similarity index 100%
rename from software/package/brltty/brltty.service
rename to buildroot/package/brltty/brltty.service
diff --git a/software/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch b/buildroot/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch
similarity index 100%
rename from software/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch
rename to buildroot/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch
diff --git a/software/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch b/buildroot/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch
similarity index 100%
rename from software/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch
rename to buildroot/package/brotli/0002-Revert-Add-runtime-linker-path-to-pkg-config-files.patch
diff --git a/software/package/brotli/Config.in b/buildroot/package/brotli/Config.in
similarity index 100%
rename from software/package/brotli/Config.in
rename to buildroot/package/brotli/Config.in
diff --git a/software/package/brotli/brotli.hash b/buildroot/package/brotli/brotli.hash
similarity index 100%
rename from software/package/brotli/brotli.hash
rename to buildroot/package/brotli/brotli.hash
diff --git a/software/package/brotli/brotli.mk b/buildroot/package/brotli/brotli.mk
similarity index 100%
rename from software/package/brotli/brotli.mk
rename to buildroot/package/brotli/brotli.mk
diff --git a/software/package/bsdiff/0001-Add-missing-header-for-u_char.patch b/buildroot/package/bsdiff/0001-Add-missing-header-for-u_char.patch
similarity index 100%
rename from software/package/bsdiff/0001-Add-missing-header-for-u_char.patch
rename to buildroot/package/bsdiff/0001-Add-missing-header-for-u_char.patch
diff --git a/software/package/bsdiff/Config.in b/buildroot/package/bsdiff/Config.in
similarity index 100%
rename from software/package/bsdiff/Config.in
rename to buildroot/package/bsdiff/Config.in
diff --git a/software/package/bsdiff/bsdiff.hash b/buildroot/package/bsdiff/bsdiff.hash
similarity index 100%
rename from software/package/bsdiff/bsdiff.hash
rename to buildroot/package/bsdiff/bsdiff.hash
diff --git a/software/package/bsdiff/bsdiff.mk b/buildroot/package/bsdiff/bsdiff.mk
similarity index 100%
rename from software/package/bsdiff/bsdiff.mk
rename to buildroot/package/bsdiff/bsdiff.mk
diff --git a/software/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
similarity index 100%
rename from software/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
rename to buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
diff --git a/software/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch b/buildroot/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch
similarity index 100%
rename from software/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch
rename to buildroot/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch
diff --git a/software/package/btrfs-progs/Config.in b/buildroot/package/btrfs-progs/Config.in
similarity index 100%
rename from software/package/btrfs-progs/Config.in
rename to buildroot/package/btrfs-progs/Config.in
diff --git a/software/package/btrfs-progs/Config.in.host b/buildroot/package/btrfs-progs/Config.in.host
similarity index 100%
rename from software/package/btrfs-progs/Config.in.host
rename to buildroot/package/btrfs-progs/Config.in.host
diff --git a/software/package/btrfs-progs/btrfs-progs.hash b/buildroot/package/btrfs-progs/btrfs-progs.hash
similarity index 100%
rename from software/package/btrfs-progs/btrfs-progs.hash
rename to buildroot/package/btrfs-progs/btrfs-progs.hash
diff --git a/software/package/btrfs-progs/btrfs-progs.mk b/buildroot/package/btrfs-progs/btrfs-progs.mk
similarity index 100%
rename from software/package/btrfs-progs/btrfs-progs.mk
rename to buildroot/package/btrfs-progs/btrfs-progs.mk
diff --git a/software/package/bubblewrap/Config.in b/buildroot/package/bubblewrap/Config.in
similarity index 100%
rename from software/package/bubblewrap/Config.in
rename to buildroot/package/bubblewrap/Config.in
diff --git a/software/package/bubblewrap/bubblewrap.hash b/buildroot/package/bubblewrap/bubblewrap.hash
similarity index 100%
rename from software/package/bubblewrap/bubblewrap.hash
rename to buildroot/package/bubblewrap/bubblewrap.hash
diff --git a/software/package/bubblewrap/bubblewrap.mk b/buildroot/package/bubblewrap/bubblewrap.mk
similarity index 100%
rename from software/package/bubblewrap/bubblewrap.mk
rename to buildroot/package/bubblewrap/bubblewrap.mk
diff --git a/software/package/bullet/Config.in b/buildroot/package/bullet/Config.in
similarity index 100%
rename from software/package/bullet/Config.in
rename to buildroot/package/bullet/Config.in
diff --git a/software/package/bullet/bullet.hash b/buildroot/package/bullet/bullet.hash
similarity index 100%
rename from software/package/bullet/bullet.hash
rename to buildroot/package/bullet/bullet.hash
diff --git a/software/package/bullet/bullet.mk b/buildroot/package/bullet/bullet.mk
similarity index 100%
rename from software/package/bullet/bullet.mk
rename to buildroot/package/bullet/bullet.mk
diff --git a/software/package/bustle/Config.in b/buildroot/package/bustle/Config.in
similarity index 100%
rename from software/package/bustle/Config.in
rename to buildroot/package/bustle/Config.in
diff --git a/software/package/bustle/bustle.hash b/buildroot/package/bustle/bustle.hash
similarity index 100%
rename from software/package/bustle/bustle.hash
rename to buildroot/package/bustle/bustle.hash
diff --git a/software/package/bustle/bustle.mk b/buildroot/package/bustle/bustle.mk
similarity index 100%
rename from software/package/bustle/bustle.mk
rename to buildroot/package/bustle/bustle.mk
diff --git a/software/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch b/buildroot/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch
similarity index 100%
rename from software/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch
rename to buildroot/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch
diff --git a/software/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/buildroot/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch
similarity index 100%
rename from software/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch
rename to buildroot/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch
diff --git a/software/package/busybox/Config.in b/buildroot/package/busybox/Config.in
similarity index 100%
rename from software/package/busybox/Config.in
rename to buildroot/package/busybox/Config.in
diff --git a/software/package/busybox/S01syslogd b/buildroot/package/busybox/S01syslogd
similarity index 100%
rename from software/package/busybox/S01syslogd
rename to buildroot/package/busybox/S01syslogd
diff --git a/software/package/busybox/S02klogd b/buildroot/package/busybox/S02klogd
similarity index 100%
rename from software/package/busybox/S02klogd
rename to buildroot/package/busybox/S02klogd
diff --git a/software/package/busybox/S02sysctl b/buildroot/package/busybox/S02sysctl
similarity index 100%
rename from software/package/busybox/S02sysctl
rename to buildroot/package/busybox/S02sysctl
diff --git a/software/package/busybox/S10mdev b/buildroot/package/busybox/S10mdev
similarity index 100%
rename from software/package/busybox/S10mdev
rename to buildroot/package/busybox/S10mdev
diff --git a/software/package/busybox/S15watchdog b/buildroot/package/busybox/S15watchdog
similarity index 100%
rename from software/package/busybox/S15watchdog
rename to buildroot/package/busybox/S15watchdog
diff --git a/software/package/busybox/S50telnet b/buildroot/package/busybox/S50telnet
similarity index 100%
rename from software/package/busybox/S50telnet
rename to buildroot/package/busybox/S50telnet
diff --git a/software/package/busybox/busybox-minimal.config b/buildroot/package/busybox/busybox-minimal.config
similarity index 100%
rename from software/package/busybox/busybox-minimal.config
rename to buildroot/package/busybox/busybox-minimal.config
diff --git a/software/package/busybox/busybox.config b/buildroot/package/busybox/busybox.config
similarity index 100%
rename from software/package/busybox/busybox.config
rename to buildroot/package/busybox/busybox.config
diff --git a/software/package/busybox/busybox.hash b/buildroot/package/busybox/busybox.hash
similarity index 100%
rename from software/package/busybox/busybox.hash
rename to buildroot/package/busybox/busybox.hash
diff --git a/software/package/busybox/busybox.mk b/buildroot/package/busybox/busybox.mk
similarity index 100%
rename from software/package/busybox/busybox.mk
rename to buildroot/package/busybox/busybox.mk
diff --git a/software/package/busybox/inittab b/buildroot/package/busybox/inittab
similarity index 100%
rename from software/package/busybox/inittab
rename to buildroot/package/busybox/inittab
diff --git a/software/package/busybox/mdev.conf b/buildroot/package/busybox/mdev.conf
similarity index 100%
rename from software/package/busybox/mdev.conf
rename to buildroot/package/busybox/mdev.conf
diff --git a/software/package/busybox/udhcpc.script b/buildroot/package/busybox/udhcpc.script
similarity index 100%
rename from software/package/busybox/udhcpc.script
rename to buildroot/package/busybox/udhcpc.script
diff --git a/software/package/bwm-ng/Config.in b/buildroot/package/bwm-ng/Config.in
similarity index 100%
rename from software/package/bwm-ng/Config.in
rename to buildroot/package/bwm-ng/Config.in
diff --git a/software/package/bwm-ng/bwm-ng.hash b/buildroot/package/bwm-ng/bwm-ng.hash
similarity index 100%
rename from software/package/bwm-ng/bwm-ng.hash
rename to buildroot/package/bwm-ng/bwm-ng.hash
diff --git a/software/package/bwm-ng/bwm-ng.mk b/buildroot/package/bwm-ng/bwm-ng.mk
similarity index 100%
rename from software/package/bwm-ng/bwm-ng.mk
rename to buildroot/package/bwm-ng/bwm-ng.mk
diff --git a/software/package/bzip2/0001-build-objects-twice.patch b/buildroot/package/bzip2/0001-build-objects-twice.patch
similarity index 100%
rename from software/package/bzip2/0001-build-objects-twice.patch
rename to buildroot/package/bzip2/0001-build-objects-twice.patch
diff --git a/software/package/bzip2/0002-improve-build-system.patch b/buildroot/package/bzip2/0002-improve-build-system.patch
similarity index 100%
rename from software/package/bzip2/0002-improve-build-system.patch
rename to buildroot/package/bzip2/0002-improve-build-system.patch
diff --git a/software/package/bzip2/Config.in b/buildroot/package/bzip2/Config.in
similarity index 100%
rename from software/package/bzip2/Config.in
rename to buildroot/package/bzip2/Config.in
diff --git a/software/package/bzip2/bzip2.hash b/buildroot/package/bzip2/bzip2.hash
similarity index 100%
rename from software/package/bzip2/bzip2.hash
rename to buildroot/package/bzip2/bzip2.hash
diff --git a/software/package/bzip2/bzip2.mk b/buildroot/package/bzip2/bzip2.mk
similarity index 100%
rename from software/package/bzip2/bzip2.mk
rename to buildroot/package/bzip2/bzip2.mk
diff --git a/software/package/c-ares/Config.in b/buildroot/package/c-ares/Config.in
similarity index 100%
rename from software/package/c-ares/Config.in
rename to buildroot/package/c-ares/Config.in
diff --git a/software/package/c-ares/c-ares.hash b/buildroot/package/c-ares/c-ares.hash
similarity index 100%
rename from software/package/c-ares/c-ares.hash
rename to buildroot/package/c-ares/c-ares.hash
diff --git a/software/package/c-ares/c-ares.mk b/buildroot/package/c-ares/c-ares.mk
similarity index 100%
rename from software/package/c-ares/c-ares.mk
rename to buildroot/package/c-ares/c-ares.mk
diff --git a/software/package/c-capnproto/Config.in b/buildroot/package/c-capnproto/Config.in
similarity index 100%
rename from software/package/c-capnproto/Config.in
rename to buildroot/package/c-capnproto/Config.in
diff --git a/software/package/c-capnproto/c-capnproto.hash b/buildroot/package/c-capnproto/c-capnproto.hash
similarity index 100%
rename from software/package/c-capnproto/c-capnproto.hash
rename to buildroot/package/c-capnproto/c-capnproto.hash
diff --git a/software/package/c-capnproto/c-capnproto.mk b/buildroot/package/c-capnproto/c-capnproto.mk
similarity index 100%
rename from software/package/c-capnproto/c-capnproto.mk
rename to buildroot/package/c-capnproto/c-capnproto.mk
diff --git a/software/package/c-icap-modules/Config.in b/buildroot/package/c-icap-modules/Config.in
similarity index 100%
rename from software/package/c-icap-modules/Config.in
rename to buildroot/package/c-icap-modules/Config.in
diff --git a/software/package/c-icap-modules/c-icap-modules.hash b/buildroot/package/c-icap-modules/c-icap-modules.hash
similarity index 100%
rename from software/package/c-icap-modules/c-icap-modules.hash
rename to buildroot/package/c-icap-modules/c-icap-modules.hash
diff --git a/software/package/c-icap-modules/c-icap-modules.mk b/buildroot/package/c-icap-modules/c-icap-modules.mk
similarity index 100%
rename from software/package/c-icap-modules/c-icap-modules.mk
rename to buildroot/package/c-icap-modules/c-icap-modules.mk
diff --git a/software/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch b/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch
similarity index 100%
rename from software/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch
rename to buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch
diff --git a/software/package/c-icap/Config.in b/buildroot/package/c-icap/Config.in
similarity index 100%
rename from software/package/c-icap/Config.in
rename to buildroot/package/c-icap/Config.in
diff --git a/software/package/c-icap/S96cicap b/buildroot/package/c-icap/S96cicap
similarity index 100%
rename from software/package/c-icap/S96cicap
rename to buildroot/package/c-icap/S96cicap
diff --git a/software/package/c-icap/c-icap.hash b/buildroot/package/c-icap/c-icap.hash
similarity index 100%
rename from software/package/c-icap/c-icap.hash
rename to buildroot/package/c-icap/c-icap.hash
diff --git a/software/package/c-icap/c-icap.mk b/buildroot/package/c-icap/c-icap.mk
similarity index 100%
rename from software/package/c-icap/c-icap.mk
rename to buildroot/package/c-icap/c-icap.mk
diff --git a/software/package/c-periphery/Config.in b/buildroot/package/c-periphery/Config.in
similarity index 100%
rename from software/package/c-periphery/Config.in
rename to buildroot/package/c-periphery/Config.in
diff --git a/software/package/c-periphery/c-periphery.hash b/buildroot/package/c-periphery/c-periphery.hash
similarity index 100%
rename from software/package/c-periphery/c-periphery.hash
rename to buildroot/package/c-periphery/c-periphery.hash
diff --git a/software/package/c-periphery/c-periphery.mk b/buildroot/package/c-periphery/c-periphery.mk
similarity index 100%
rename from software/package/c-periphery/c-periphery.mk
rename to buildroot/package/c-periphery/c-periphery.mk
diff --git a/software/package/ca-certificates/Config.in b/buildroot/package/ca-certificates/Config.in
similarity index 100%
rename from software/package/ca-certificates/Config.in
rename to buildroot/package/ca-certificates/Config.in
diff --git a/software/package/ca-certificates/ca-certificates.hash b/buildroot/package/ca-certificates/ca-certificates.hash
similarity index 100%
rename from software/package/ca-certificates/ca-certificates.hash
rename to buildroot/package/ca-certificates/ca-certificates.hash
diff --git a/software/package/ca-certificates/ca-certificates.mk b/buildroot/package/ca-certificates/ca-certificates.mk
similarity index 100%
rename from software/package/ca-certificates/ca-certificates.mk
rename to buildroot/package/ca-certificates/ca-certificates.mk
diff --git a/software/package/cache-calibrator/0001-Fix-conflicting-round-function.patch b/buildroot/package/cache-calibrator/0001-Fix-conflicting-round-function.patch
similarity index 100%
rename from software/package/cache-calibrator/0001-Fix-conflicting-round-function.patch
rename to buildroot/package/cache-calibrator/0001-Fix-conflicting-round-function.patch
diff --git a/software/package/cache-calibrator/Config.in b/buildroot/package/cache-calibrator/Config.in
similarity index 100%
rename from software/package/cache-calibrator/Config.in
rename to buildroot/package/cache-calibrator/Config.in
diff --git a/software/package/cache-calibrator/cache-calibrator.hash b/buildroot/package/cache-calibrator/cache-calibrator.hash
similarity index 100%
rename from software/package/cache-calibrator/cache-calibrator.hash
rename to buildroot/package/cache-calibrator/cache-calibrator.hash
diff --git a/software/package/cache-calibrator/cache-calibrator.mk b/buildroot/package/cache-calibrator/cache-calibrator.mk
similarity index 100%
rename from software/package/cache-calibrator/cache-calibrator.mk
rename to buildroot/package/cache-calibrator/cache-calibrator.mk
diff --git a/software/package/cairo/0001-fix-nofork-build.patch b/buildroot/package/cairo/0001-fix-nofork-build.patch
similarity index 100%
rename from software/package/cairo/0001-fix-nofork-build.patch
rename to buildroot/package/cairo/0001-fix-nofork-build.patch
diff --git a/software/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch b/buildroot/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
similarity index 100%
rename from software/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
rename to buildroot/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
diff --git a/software/package/cairo/Config.in b/buildroot/package/cairo/Config.in
similarity index 100%
rename from software/package/cairo/Config.in
rename to buildroot/package/cairo/Config.in
diff --git a/software/package/cairo/cairo.hash b/buildroot/package/cairo/cairo.hash
similarity index 100%
rename from software/package/cairo/cairo.hash
rename to buildroot/package/cairo/cairo.hash
diff --git a/software/package/cairo/cairo.mk b/buildroot/package/cairo/cairo.mk
similarity index 100%
rename from software/package/cairo/cairo.mk
rename to buildroot/package/cairo/cairo.mk
diff --git a/software/package/cairomm/Config.in b/buildroot/package/cairomm/Config.in
similarity index 100%
rename from software/package/cairomm/Config.in
rename to buildroot/package/cairomm/Config.in
diff --git a/software/package/cairomm/cairomm.hash b/buildroot/package/cairomm/cairomm.hash
similarity index 100%
rename from software/package/cairomm/cairomm.hash
rename to buildroot/package/cairomm/cairomm.hash
diff --git a/software/package/cairomm/cairomm.mk b/buildroot/package/cairomm/cairomm.mk
similarity index 100%
rename from software/package/cairomm/cairomm.mk
rename to buildroot/package/cairomm/cairomm.mk
diff --git a/software/package/can-utils/Config.in b/buildroot/package/can-utils/Config.in
similarity index 100%
rename from software/package/can-utils/Config.in
rename to buildroot/package/can-utils/Config.in
diff --git a/software/package/can-utils/can-utils.hash b/buildroot/package/can-utils/can-utils.hash
similarity index 100%
rename from software/package/can-utils/can-utils.hash
rename to buildroot/package/can-utils/can-utils.hash
diff --git a/software/package/can-utils/can-utils.mk b/buildroot/package/can-utils/can-utils.mk
similarity index 100%
rename from software/package/can-utils/can-utils.mk
rename to buildroot/package/can-utils/can-utils.mk
diff --git a/software/package/canfestival/0001-install-pkgconfig-module-for-canfestival.patch b/buildroot/package/canfestival/0001-install-pkgconfig-module-for-canfestival.patch
similarity index 100%
rename from software/package/canfestival/0001-install-pkgconfig-module-for-canfestival.patch
rename to buildroot/package/canfestival/0001-install-pkgconfig-module-for-canfestival.patch
diff --git a/software/package/canfestival/0002-allow-to-set-python-interpreter.patch b/buildroot/package/canfestival/0002-allow-to-set-python-interpreter.patch
similarity index 100%
rename from software/package/canfestival/0002-allow-to-set-python-interpreter.patch
rename to buildroot/package/canfestival/0002-allow-to-set-python-interpreter.patch
diff --git a/software/package/canfestival/Config.in b/buildroot/package/canfestival/Config.in
similarity index 100%
rename from software/package/canfestival/Config.in
rename to buildroot/package/canfestival/Config.in
diff --git a/software/package/canfestival/canfestival.hash b/buildroot/package/canfestival/canfestival.hash
similarity index 100%
rename from software/package/canfestival/canfestival.hash
rename to buildroot/package/canfestival/canfestival.hash
diff --git a/software/package/canfestival/canfestival.mk b/buildroot/package/canfestival/canfestival.mk
similarity index 100%
rename from software/package/canfestival/canfestival.mk
rename to buildroot/package/canfestival/canfestival.mk
diff --git a/software/package/cannelloni/0001-Add-missing-cstdio-include.patch b/buildroot/package/cannelloni/0001-Add-missing-cstdio-include.patch
similarity index 100%
rename from software/package/cannelloni/0001-Add-missing-cstdio-include.patch
rename to buildroot/package/cannelloni/0001-Add-missing-cstdio-include.patch
diff --git a/software/package/cannelloni/Config.in b/buildroot/package/cannelloni/Config.in
similarity index 100%
rename from software/package/cannelloni/Config.in
rename to buildroot/package/cannelloni/Config.in
diff --git a/software/package/cannelloni/cannelloni.hash b/buildroot/package/cannelloni/cannelloni.hash
similarity index 100%
rename from software/package/cannelloni/cannelloni.hash
rename to buildroot/package/cannelloni/cannelloni.hash
diff --git a/software/package/cannelloni/cannelloni.mk b/buildroot/package/cannelloni/cannelloni.mk
similarity index 100%
rename from software/package/cannelloni/cannelloni.mk
rename to buildroot/package/cannelloni/cannelloni.mk
diff --git a/software/package/cantarell/Config.in b/buildroot/package/cantarell/Config.in
similarity index 100%
rename from software/package/cantarell/Config.in
rename to buildroot/package/cantarell/Config.in
diff --git a/software/package/cantarell/cantarell.hash b/buildroot/package/cantarell/cantarell.hash
similarity index 100%
rename from software/package/cantarell/cantarell.hash
rename to buildroot/package/cantarell/cantarell.hash
diff --git a/software/package/cantarell/cantarell.mk b/buildroot/package/cantarell/cantarell.mk
similarity index 100%
rename from software/package/cantarell/cantarell.mk
rename to buildroot/package/cantarell/cantarell.mk
diff --git a/software/package/capnproto/Config.in b/buildroot/package/capnproto/Config.in
similarity index 100%
rename from software/package/capnproto/Config.in
rename to buildroot/package/capnproto/Config.in
diff --git a/software/package/capnproto/capnproto.hash b/buildroot/package/capnproto/capnproto.hash
similarity index 100%
rename from software/package/capnproto/capnproto.hash
rename to buildroot/package/capnproto/capnproto.hash
diff --git a/software/package/capnproto/capnproto.mk b/buildroot/package/capnproto/capnproto.mk
similarity index 100%
rename from software/package/capnproto/capnproto.mk
rename to buildroot/package/capnproto/capnproto.mk
diff --git a/software/package/caps/0001-Fix-stdint-types-with-musl.patch b/buildroot/package/caps/0001-Fix-stdint-types-with-musl.patch
similarity index 100%
rename from software/package/caps/0001-Fix-stdint-types-with-musl.patch
rename to buildroot/package/caps/0001-Fix-stdint-types-with-musl.patch
diff --git a/software/package/caps/Config.in b/buildroot/package/caps/Config.in
similarity index 100%
rename from software/package/caps/Config.in
rename to buildroot/package/caps/Config.in
diff --git a/software/package/caps/caps.hash b/buildroot/package/caps/caps.hash
similarity index 100%
rename from software/package/caps/caps.hash
rename to buildroot/package/caps/caps.hash
diff --git a/software/package/caps/caps.mk b/buildroot/package/caps/caps.mk
similarity index 100%
rename from software/package/caps/caps.mk
rename to buildroot/package/caps/caps.mk
diff --git a/software/package/cargo-bin/cargo-bin.hash b/buildroot/package/cargo-bin/cargo-bin.hash
similarity index 100%
rename from software/package/cargo-bin/cargo-bin.hash
rename to buildroot/package/cargo-bin/cargo-bin.hash
diff --git a/software/package/cargo-bin/cargo-bin.mk b/buildroot/package/cargo-bin/cargo-bin.mk
similarity index 100%
rename from software/package/cargo-bin/cargo-bin.mk
rename to buildroot/package/cargo-bin/cargo-bin.mk
diff --git a/software/package/cargo/Config.in.host b/buildroot/package/cargo/Config.in.host
similarity index 100%
rename from software/package/cargo/Config.in.host
rename to buildroot/package/cargo/Config.in.host
diff --git a/software/package/cargo/cargo.hash b/buildroot/package/cargo/cargo.hash
similarity index 100%
rename from software/package/cargo/cargo.hash
rename to buildroot/package/cargo/cargo.hash
diff --git a/software/package/cargo/cargo.mk b/buildroot/package/cargo/cargo.mk
similarity index 100%
rename from software/package/cargo/cargo.mk
rename to buildroot/package/cargo/cargo.mk
diff --git a/software/package/cargo/config.in b/buildroot/package/cargo/config.in
similarity index 100%
rename from software/package/cargo/config.in
rename to buildroot/package/cargo/config.in
diff --git a/software/package/cbootimage/Config.in b/buildroot/package/cbootimage/Config.in
similarity index 100%
rename from software/package/cbootimage/Config.in
rename to buildroot/package/cbootimage/Config.in
diff --git a/software/package/cbootimage/Config.in.host b/buildroot/package/cbootimage/Config.in.host
similarity index 100%
rename from software/package/cbootimage/Config.in.host
rename to buildroot/package/cbootimage/Config.in.host
diff --git a/software/package/cbootimage/cbootimage.hash b/buildroot/package/cbootimage/cbootimage.hash
similarity index 100%
rename from software/package/cbootimage/cbootimage.hash
rename to buildroot/package/cbootimage/cbootimage.hash
diff --git a/software/package/cbootimage/cbootimage.mk b/buildroot/package/cbootimage/cbootimage.mk
similarity index 100%
rename from software/package/cbootimage/cbootimage.mk
rename to buildroot/package/cbootimage/cbootimage.mk
diff --git a/software/package/cc-tool/0001-add-missing-stdarg-include.patch b/buildroot/package/cc-tool/0001-add-missing-stdarg-include.patch
similarity index 100%
rename from software/package/cc-tool/0001-add-missing-stdarg-include.patch
rename to buildroot/package/cc-tool/0001-add-missing-stdarg-include.patch
diff --git a/software/package/cc-tool/0002-boost-m4.patch b/buildroot/package/cc-tool/0002-boost-m4.patch
similarity index 100%
rename from software/package/cc-tool/0002-boost-m4.patch
rename to buildroot/package/cc-tool/0002-boost-m4.patch
diff --git a/software/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch b/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
similarity index 100%
rename from software/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
rename to buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
diff --git a/software/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch b/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch
similarity index 100%
rename from software/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch
rename to buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch
diff --git a/software/package/cc-tool/Config.in b/buildroot/package/cc-tool/Config.in
similarity index 100%
rename from software/package/cc-tool/Config.in
rename to buildroot/package/cc-tool/Config.in
diff --git a/software/package/cc-tool/cc-tool.hash b/buildroot/package/cc-tool/cc-tool.hash
similarity index 100%
rename from software/package/cc-tool/cc-tool.hash
rename to buildroot/package/cc-tool/cc-tool.hash
diff --git a/software/package/cc-tool/cc-tool.mk b/buildroot/package/cc-tool/cc-tool.mk
similarity index 100%
rename from software/package/cc-tool/cc-tool.mk
rename to buildroot/package/cc-tool/cc-tool.mk
diff --git a/software/package/ccache/ccache.hash b/buildroot/package/ccache/ccache.hash
similarity index 100%
rename from software/package/ccache/ccache.hash
rename to buildroot/package/ccache/ccache.hash
diff --git a/software/package/ccache/ccache.mk b/buildroot/package/ccache/ccache.mk
similarity index 100%
rename from software/package/ccache/ccache.mk
rename to buildroot/package/ccache/ccache.mk
diff --git a/software/package/ccid/Config.in b/buildroot/package/ccid/Config.in
similarity index 100%
rename from software/package/ccid/Config.in
rename to buildroot/package/ccid/Config.in
diff --git a/software/package/ccid/ccid.hash b/buildroot/package/ccid/ccid.hash
similarity index 100%
rename from software/package/ccid/ccid.hash
rename to buildroot/package/ccid/ccid.hash
diff --git a/software/package/ccid/ccid.mk b/buildroot/package/ccid/ccid.mk
similarity index 100%
rename from software/package/ccid/ccid.mk
rename to buildroot/package/ccid/ccid.mk
diff --git a/software/package/ccrypt/Config.in b/buildroot/package/ccrypt/Config.in
similarity index 100%
rename from software/package/ccrypt/Config.in
rename to buildroot/package/ccrypt/Config.in
diff --git a/software/package/ccrypt/ccrypt.hash b/buildroot/package/ccrypt/ccrypt.hash
similarity index 100%
rename from software/package/ccrypt/ccrypt.hash
rename to buildroot/package/ccrypt/ccrypt.hash
diff --git a/software/package/ccrypt/ccrypt.mk b/buildroot/package/ccrypt/ccrypt.mk
similarity index 100%
rename from software/package/ccrypt/ccrypt.mk
rename to buildroot/package/ccrypt/ccrypt.mk
diff --git a/software/package/cctz/Config.in b/buildroot/package/cctz/Config.in
similarity index 100%
rename from software/package/cctz/Config.in
rename to buildroot/package/cctz/Config.in
diff --git a/software/package/cctz/cctz.hash b/buildroot/package/cctz/cctz.hash
similarity index 100%
rename from software/package/cctz/cctz.hash
rename to buildroot/package/cctz/cctz.hash
diff --git a/software/package/cctz/cctz.mk b/buildroot/package/cctz/cctz.mk
similarity index 100%
rename from software/package/cctz/cctz.mk
rename to buildroot/package/cctz/cctz.mk
diff --git a/software/package/cdrkit/0001-no-rcmd.patch b/buildroot/package/cdrkit/0001-no-rcmd.patch
similarity index 100%
rename from software/package/cdrkit/0001-no-rcmd.patch
rename to buildroot/package/cdrkit/0001-no-rcmd.patch
diff --git a/software/package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch b/buildroot/package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch
similarity index 100%
rename from software/package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch
rename to buildroot/package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch
diff --git a/software/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch b/buildroot/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch
similarity index 100%
rename from software/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch
rename to buildroot/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch
diff --git a/software/package/cdrkit/Config.in b/buildroot/package/cdrkit/Config.in
similarity index 100%
rename from software/package/cdrkit/Config.in
rename to buildroot/package/cdrkit/Config.in
diff --git a/software/package/cdrkit/cdrkit.hash b/buildroot/package/cdrkit/cdrkit.hash
similarity index 100%
rename from software/package/cdrkit/cdrkit.hash
rename to buildroot/package/cdrkit/cdrkit.hash
diff --git a/software/package/cdrkit/cdrkit.mk b/buildroot/package/cdrkit/cdrkit.mk
similarity index 100%
rename from software/package/cdrkit/cdrkit.mk
rename to buildroot/package/cdrkit/cdrkit.mk
diff --git a/software/package/cegui06/0001-stddef.h.patch b/buildroot/package/cegui06/0001-stddef.h.patch
similarity index 100%
rename from software/package/cegui06/0001-stddef.h.patch
rename to buildroot/package/cegui06/0001-stddef.h.patch
diff --git a/software/package/cegui06/Config.in b/buildroot/package/cegui06/Config.in
similarity index 100%
rename from software/package/cegui06/Config.in
rename to buildroot/package/cegui06/Config.in
diff --git a/software/package/cegui06/cegui06.hash b/buildroot/package/cegui06/cegui06.hash
similarity index 100%
rename from software/package/cegui06/cegui06.hash
rename to buildroot/package/cegui06/cegui06.hash
diff --git a/software/package/cegui06/cegui06.mk b/buildroot/package/cegui06/cegui06.mk
similarity index 100%
rename from software/package/cegui06/cegui06.mk
rename to buildroot/package/cegui06/cegui06.mk
diff --git a/software/package/cereal/Config.in b/buildroot/package/cereal/Config.in
similarity index 100%
rename from software/package/cereal/Config.in
rename to buildroot/package/cereal/Config.in
diff --git a/software/package/cereal/cereal.hash b/buildroot/package/cereal/cereal.hash
similarity index 100%
rename from software/package/cereal/cereal.hash
rename to buildroot/package/cereal/cereal.hash
diff --git a/software/package/cereal/cereal.mk b/buildroot/package/cereal/cereal.mk
similarity index 100%
rename from software/package/cereal/cereal.mk
rename to buildroot/package/cereal/cereal.mk
diff --git a/software/package/cgic/0001-prepare_makefile.patch b/buildroot/package/cgic/0001-prepare_makefile.patch
similarity index 100%
rename from software/package/cgic/0001-prepare_makefile.patch
rename to buildroot/package/cgic/0001-prepare_makefile.patch
diff --git a/software/package/cgic/0002-file_enhancements.patch b/buildroot/package/cgic/0002-file_enhancements.patch
similarity index 100%
rename from software/package/cgic/0002-file_enhancements.patch
rename to buildroot/package/cgic/0002-file_enhancements.patch
diff --git a/software/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch b/buildroot/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch
similarity index 100%
rename from software/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch
rename to buildroot/package/cgic/0003-restore-cgiFormFileGetTempfileName.patch
diff --git a/software/package/cgic/Config.in b/buildroot/package/cgic/Config.in
similarity index 100%
rename from software/package/cgic/Config.in
rename to buildroot/package/cgic/Config.in
diff --git a/software/package/cgic/cgic.hash b/buildroot/package/cgic/cgic.hash
similarity index 100%
rename from software/package/cgic/cgic.hash
rename to buildroot/package/cgic/cgic.hash
diff --git a/software/package/cgic/cgic.mk b/buildroot/package/cgic/cgic.mk
similarity index 100%
rename from software/package/cgic/cgic.mk
rename to buildroot/package/cgic/cgic.mk
diff --git a/software/package/cgilua/Config.in b/buildroot/package/cgilua/Config.in
similarity index 100%
rename from software/package/cgilua/Config.in
rename to buildroot/package/cgilua/Config.in
diff --git a/software/package/cgilua/cgilua.hash b/buildroot/package/cgilua/cgilua.hash
similarity index 100%
rename from software/package/cgilua/cgilua.hash
rename to buildroot/package/cgilua/cgilua.hash
diff --git a/software/package/cgilua/cgilua.mk b/buildroot/package/cgilua/cgilua.mk
similarity index 100%
rename from software/package/cgilua/cgilua.mk
rename to buildroot/package/cgilua/cgilua.mk
diff --git a/software/package/cgroupfs-mount/Config.in b/buildroot/package/cgroupfs-mount/Config.in
similarity index 100%
rename from software/package/cgroupfs-mount/Config.in
rename to buildroot/package/cgroupfs-mount/Config.in
diff --git a/software/package/cgroupfs-mount/S30cgroupfs b/buildroot/package/cgroupfs-mount/S30cgroupfs
similarity index 100%
rename from software/package/cgroupfs-mount/S30cgroupfs
rename to buildroot/package/cgroupfs-mount/S30cgroupfs
diff --git a/software/package/cgroupfs-mount/cgroupfs-mount.hash b/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash
similarity index 100%
rename from software/package/cgroupfs-mount/cgroupfs-mount.hash
rename to buildroot/package/cgroupfs-mount/cgroupfs-mount.hash
diff --git a/software/package/cgroupfs-mount/cgroupfs-mount.mk b/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk
similarity index 100%
rename from software/package/cgroupfs-mount/cgroupfs-mount.mk
rename to buildroot/package/cgroupfs-mount/cgroupfs-mount.mk
diff --git a/software/package/check/Config.in b/buildroot/package/check/Config.in
similarity index 100%
rename from software/package/check/Config.in
rename to buildroot/package/check/Config.in
diff --git a/software/package/check/check.hash b/buildroot/package/check/check.hash
similarity index 100%
rename from software/package/check/check.hash
rename to buildroot/package/check/check.hash
diff --git a/software/package/check/check.mk b/buildroot/package/check/check.mk
similarity index 100%
rename from software/package/check/check.mk
rename to buildroot/package/check/check.mk
diff --git a/software/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
similarity index 100%
rename from software/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
rename to buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
diff --git a/software/package/checkpolicy/Config.in b/buildroot/package/checkpolicy/Config.in
similarity index 100%
rename from software/package/checkpolicy/Config.in
rename to buildroot/package/checkpolicy/Config.in
diff --git a/software/package/checkpolicy/Config.in.host b/buildroot/package/checkpolicy/Config.in.host
similarity index 100%
rename from software/package/checkpolicy/Config.in.host
rename to buildroot/package/checkpolicy/Config.in.host
diff --git a/software/package/checkpolicy/checkpolicy.hash b/buildroot/package/checkpolicy/checkpolicy.hash
similarity index 100%
rename from software/package/checkpolicy/checkpolicy.hash
rename to buildroot/package/checkpolicy/checkpolicy.hash
diff --git a/software/package/checkpolicy/checkpolicy.mk b/buildroot/package/checkpolicy/checkpolicy.mk
similarity index 100%
rename from software/package/checkpolicy/checkpolicy.mk
rename to buildroot/package/checkpolicy/checkpolicy.mk
diff --git a/software/package/checksec/Config.in.host b/buildroot/package/checksec/Config.in.host
similarity index 100%
rename from software/package/checksec/Config.in.host
rename to buildroot/package/checksec/Config.in.host
diff --git a/software/package/checksec/checksec.hash b/buildroot/package/checksec/checksec.hash
similarity index 100%
rename from software/package/checksec/checksec.hash
rename to buildroot/package/checksec/checksec.hash
diff --git a/software/package/checksec/checksec.mk b/buildroot/package/checksec/checksec.mk
similarity index 100%
rename from software/package/checksec/checksec.mk
rename to buildroot/package/checksec/checksec.mk
diff --git a/software/package/chipmunk/0001-Fix-build-failure-on-musl.patch b/buildroot/package/chipmunk/0001-Fix-build-failure-on-musl.patch
similarity index 100%
rename from software/package/chipmunk/0001-Fix-build-failure-on-musl.patch
rename to buildroot/package/chipmunk/0001-Fix-build-failure-on-musl.patch
diff --git a/software/package/chipmunk/Config.in b/buildroot/package/chipmunk/Config.in
similarity index 100%
rename from software/package/chipmunk/Config.in
rename to buildroot/package/chipmunk/Config.in
diff --git a/software/package/chipmunk/chipmunk.hash b/buildroot/package/chipmunk/chipmunk.hash
similarity index 100%
rename from software/package/chipmunk/chipmunk.hash
rename to buildroot/package/chipmunk/chipmunk.hash
diff --git a/software/package/chipmunk/chipmunk.mk b/buildroot/package/chipmunk/chipmunk.mk
similarity index 100%
rename from software/package/chipmunk/chipmunk.mk
rename to buildroot/package/chipmunk/chipmunk.mk
diff --git a/software/package/chocolate-doom/Config.in b/buildroot/package/chocolate-doom/Config.in
similarity index 100%
rename from software/package/chocolate-doom/Config.in
rename to buildroot/package/chocolate-doom/Config.in
diff --git a/software/package/chocolate-doom/chocolate-doom.hash b/buildroot/package/chocolate-doom/chocolate-doom.hash
similarity index 100%
rename from software/package/chocolate-doom/chocolate-doom.hash
rename to buildroot/package/chocolate-doom/chocolate-doom.hash
diff --git a/software/package/chocolate-doom/chocolate-doom.mk b/buildroot/package/chocolate-doom/chocolate-doom.mk
similarity index 100%
rename from software/package/chocolate-doom/chocolate-doom.mk
rename to buildroot/package/chocolate-doom/chocolate-doom.mk
diff --git a/software/package/chrony/Config.in b/buildroot/package/chrony/Config.in
similarity index 100%
rename from software/package/chrony/Config.in
rename to buildroot/package/chrony/Config.in
diff --git a/software/package/chrony/S49chrony b/buildroot/package/chrony/S49chrony
similarity index 100%
rename from software/package/chrony/S49chrony
rename to buildroot/package/chrony/S49chrony
diff --git a/software/package/chrony/chrony.hash b/buildroot/package/chrony/chrony.hash
similarity index 100%
rename from software/package/chrony/chrony.hash
rename to buildroot/package/chrony/chrony.hash
diff --git a/software/package/chrony/chrony.mk b/buildroot/package/chrony/chrony.mk
similarity index 100%
rename from software/package/chrony/chrony.mk
rename to buildroot/package/chrony/chrony.mk
diff --git a/software/package/chrony/chrony.service b/buildroot/package/chrony/chrony.service
similarity index 100%
rename from software/package/chrony/chrony.service
rename to buildroot/package/chrony/chrony.service
diff --git a/software/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch b/buildroot/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch
similarity index 100%
rename from software/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch
rename to buildroot/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch
diff --git a/software/package/cifs-utils/Config.in b/buildroot/package/cifs-utils/Config.in
similarity index 100%
rename from software/package/cifs-utils/Config.in
rename to buildroot/package/cifs-utils/Config.in
diff --git a/software/package/cifs-utils/cifs-utils.hash b/buildroot/package/cifs-utils/cifs-utils.hash
similarity index 100%
rename from software/package/cifs-utils/cifs-utils.hash
rename to buildroot/package/cifs-utils/cifs-utils.hash
diff --git a/software/package/cifs-utils/cifs-utils.mk b/buildroot/package/cifs-utils/cifs-utils.mk
similarity index 100%
rename from software/package/cifs-utils/cifs-utils.mk
rename to buildroot/package/cifs-utils/cifs-utils.mk
diff --git a/software/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch b/buildroot/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch
similarity index 100%
rename from software/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch
rename to buildroot/package/circus/0001-circus-tests-rename-async-argument-of-_create_circus.patch
diff --git a/software/package/circus/Config.in b/buildroot/package/circus/Config.in
similarity index 100%
rename from software/package/circus/Config.in
rename to buildroot/package/circus/Config.in
diff --git a/software/package/circus/circus.hash b/buildroot/package/circus/circus.hash
similarity index 100%
rename from software/package/circus/circus.hash
rename to buildroot/package/circus/circus.hash
diff --git a/software/package/circus/circus.mk b/buildroot/package/circus/circus.mk
similarity index 100%
rename from software/package/circus/circus.mk
rename to buildroot/package/circus/circus.mk
diff --git a/software/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch b/buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
similarity index 100%
rename from software/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
rename to buildroot/package/civetweb/0001-modlua.ini-include-dlfcn.h.patch
diff --git a/software/package/civetweb/Config.in b/buildroot/package/civetweb/Config.in
similarity index 100%
rename from software/package/civetweb/Config.in
rename to buildroot/package/civetweb/Config.in
diff --git a/software/package/civetweb/civetweb.hash b/buildroot/package/civetweb/civetweb.hash
similarity index 100%
rename from software/package/civetweb/civetweb.hash
rename to buildroot/package/civetweb/civetweb.hash
diff --git a/software/package/civetweb/civetweb.mk b/buildroot/package/civetweb/civetweb.mk
similarity index 100%
rename from software/package/civetweb/civetweb.mk
rename to buildroot/package/civetweb/civetweb.mk
diff --git a/software/package/cjson/Config.in b/buildroot/package/cjson/Config.in
similarity index 100%
rename from software/package/cjson/Config.in
rename to buildroot/package/cjson/Config.in
diff --git a/software/package/cjson/cjson.hash b/buildroot/package/cjson/cjson.hash
similarity index 100%
rename from software/package/cjson/cjson.hash
rename to buildroot/package/cjson/cjson.hash
diff --git a/software/package/cjson/cjson.mk b/buildroot/package/cjson/cjson.mk
similarity index 100%
rename from software/package/cjson/cjson.mk
rename to buildroot/package/cjson/cjson.mk
diff --git a/software/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/buildroot/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch
similarity index 100%
rename from software/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch
rename to buildroot/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch
diff --git a/software/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
similarity index 100%
rename from software/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
rename to buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
diff --git a/software/package/clamav/Config.in b/buildroot/package/clamav/Config.in
similarity index 100%
rename from software/package/clamav/Config.in
rename to buildroot/package/clamav/Config.in
diff --git a/software/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash
similarity index 100%
rename from software/package/clamav/clamav.hash
rename to buildroot/package/clamav/clamav.hash
diff --git a/software/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk
similarity index 100%
rename from software/package/clamav/clamav.mk
rename to buildroot/package/clamav/clamav.mk
diff --git a/software/package/clang/Config.in b/buildroot/package/clang/Config.in
similarity index 100%
rename from software/package/clang/Config.in
rename to buildroot/package/clang/Config.in
diff --git a/software/package/clang/clang.hash b/buildroot/package/clang/clang.hash
similarity index 100%
rename from software/package/clang/clang.hash
rename to buildroot/package/clang/clang.hash
diff --git a/software/package/clang/clang.mk b/buildroot/package/clang/clang.mk
similarity index 100%
rename from software/package/clang/clang.mk
rename to buildroot/package/clang/clang.mk
diff --git a/software/package/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch b/buildroot/package/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch
similarity index 100%
rename from software/package/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch
rename to buildroot/package/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch
diff --git a/software/package/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch b/buildroot/package/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch
similarity index 100%
rename from software/package/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch
rename to buildroot/package/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch
diff --git a/software/package/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch b/buildroot/package/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch
similarity index 100%
rename from software/package/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch
rename to buildroot/package/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch
diff --git a/software/package/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch b/buildroot/package/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch
similarity index 100%
rename from software/package/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch
rename to buildroot/package/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch
diff --git a/software/package/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch b/buildroot/package/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch
similarity index 100%
rename from software/package/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch
rename to buildroot/package/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch
diff --git a/software/package/clapack/0006-remove-uninit-f2c.patch b/buildroot/package/clapack/0006-remove-uninit-f2c.patch
similarity index 100%
rename from software/package/clapack/0006-remove-uninit-f2c.patch
rename to buildroot/package/clapack/0006-remove-uninit-f2c.patch
diff --git a/software/package/clapack/0007-off64-t.patch b/buildroot/package/clapack/0007-off64-t.patch
similarity index 100%
rename from software/package/clapack/0007-off64-t.patch
rename to buildroot/package/clapack/0007-off64-t.patch
diff --git a/software/package/clapack/Config.in b/buildroot/package/clapack/Config.in
similarity index 100%
rename from software/package/clapack/Config.in
rename to buildroot/package/clapack/Config.in
diff --git a/software/package/clapack/clapack.hash b/buildroot/package/clapack/clapack.hash
similarity index 100%
rename from software/package/clapack/clapack.hash
rename to buildroot/package/clapack/clapack.hash
diff --git a/software/package/clapack/clapack.mk b/buildroot/package/clapack/clapack.mk
similarity index 100%
rename from software/package/clapack/clapack.mk
rename to buildroot/package/clapack/clapack.mk
diff --git a/software/package/clinfo/Config.in b/buildroot/package/clinfo/Config.in
similarity index 100%
rename from software/package/clinfo/Config.in
rename to buildroot/package/clinfo/Config.in
diff --git a/software/package/clinfo/clinfo.hash b/buildroot/package/clinfo/clinfo.hash
similarity index 100%
rename from software/package/clinfo/clinfo.hash
rename to buildroot/package/clinfo/clinfo.hash
diff --git a/software/package/clinfo/clinfo.mk b/buildroot/package/clinfo/clinfo.mk
similarity index 100%
rename from software/package/clinfo/clinfo.mk
rename to buildroot/package/clinfo/clinfo.mk
diff --git a/software/package/cloop/cloop.hash b/buildroot/package/cloop/cloop.hash
similarity index 100%
rename from software/package/cloop/cloop.hash
rename to buildroot/package/cloop/cloop.hash
diff --git a/software/package/cloop/cloop.mk b/buildroot/package/cloop/cloop.mk
similarity index 100%
rename from software/package/cloop/cloop.mk
rename to buildroot/package/cloop/cloop.mk
diff --git a/software/package/cmake/0001-rename-cmake-rootfile.patch b/buildroot/package/cmake/0001-rename-cmake-rootfile.patch
similarity index 100%
rename from software/package/cmake/0001-rename-cmake-rootfile.patch
rename to buildroot/package/cmake/0001-rename-cmake-rootfile.patch
diff --git a/software/package/cmake/Config.in b/buildroot/package/cmake/Config.in
similarity index 100%
rename from software/package/cmake/Config.in
rename to buildroot/package/cmake/Config.in
diff --git a/software/package/cmake/Config.in.host b/buildroot/package/cmake/Config.in.host
similarity index 100%
rename from software/package/cmake/Config.in.host
rename to buildroot/package/cmake/Config.in.host
diff --git a/software/package/cmake/cmake.hash b/buildroot/package/cmake/cmake.hash
similarity index 100%
rename from software/package/cmake/cmake.hash
rename to buildroot/package/cmake/cmake.hash
diff --git a/software/package/cmake/cmake.mk b/buildroot/package/cmake/cmake.mk
similarity index 100%
rename from software/package/cmake/cmake.mk
rename to buildroot/package/cmake/cmake.mk
diff --git a/software/package/cmocka/0001-Don-t-redefine-uintptr_t.patch b/buildroot/package/cmocka/0001-Don-t-redefine-uintptr_t.patch
similarity index 100%
rename from software/package/cmocka/0001-Don-t-redefine-uintptr_t.patch
rename to buildroot/package/cmocka/0001-Don-t-redefine-uintptr_t.patch
diff --git a/software/package/cmocka/Config.in b/buildroot/package/cmocka/Config.in
similarity index 100%
rename from software/package/cmocka/Config.in
rename to buildroot/package/cmocka/Config.in
diff --git a/software/package/cmocka/cmocka.hash b/buildroot/package/cmocka/cmocka.hash
similarity index 100%
rename from software/package/cmocka/cmocka.hash
rename to buildroot/package/cmocka/cmocka.hash
diff --git a/software/package/cmocka/cmocka.mk b/buildroot/package/cmocka/cmocka.mk
similarity index 100%
rename from software/package/cmocka/cmocka.mk
rename to buildroot/package/cmocka/cmocka.mk
diff --git a/software/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch
similarity index 100%
rename from software/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch
rename to buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch
diff --git a/software/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch
similarity index 100%
rename from software/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch
rename to buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch
diff --git a/software/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch b/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch
similarity index 100%
rename from software/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch
rename to buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch
diff --git a/software/package/cog/Config.in b/buildroot/package/cog/Config.in
similarity index 100%
rename from software/package/cog/Config.in
rename to buildroot/package/cog/Config.in
diff --git a/software/package/cog/cog.hash b/buildroot/package/cog/cog.hash
similarity index 100%
rename from software/package/cog/cog.hash
rename to buildroot/package/cog/cog.hash
diff --git a/software/package/cog/cog.mk b/buildroot/package/cog/cog.mk
similarity index 100%
rename from software/package/cog/cog.mk
rename to buildroot/package/cog/cog.mk
diff --git a/software/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch b/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch
similarity index 100%
rename from software/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch
rename to buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch
diff --git a/software/package/collectd/Config.in b/buildroot/package/collectd/Config.in
similarity index 100%
rename from software/package/collectd/Config.in
rename to buildroot/package/collectd/Config.in
diff --git a/software/package/collectd/collectd.hash b/buildroot/package/collectd/collectd.hash
similarity index 100%
rename from software/package/collectd/collectd.hash
rename to buildroot/package/collectd/collectd.hash
diff --git a/software/package/collectd/collectd.mk b/buildroot/package/collectd/collectd.mk
similarity index 100%
rename from software/package/collectd/collectd.mk
rename to buildroot/package/collectd/collectd.mk
diff --git a/software/package/collectd/collectd.service b/buildroot/package/collectd/collectd.service
similarity index 100%
rename from software/package/collectd/collectd.service
rename to buildroot/package/collectd/collectd.service
diff --git a/software/package/collectl/Config.in b/buildroot/package/collectl/Config.in
similarity index 100%
rename from software/package/collectl/Config.in
rename to buildroot/package/collectl/Config.in
diff --git a/software/package/collectl/collectl.hash b/buildroot/package/collectl/collectl.hash
similarity index 100%
rename from software/package/collectl/collectl.hash
rename to buildroot/package/collectl/collectl.hash
diff --git a/software/package/collectl/collectl.mk b/buildroot/package/collectl/collectl.mk
similarity index 100%
rename from software/package/collectl/collectl.mk
rename to buildroot/package/collectl/collectl.mk
diff --git a/software/package/comix-cursors/Config.in b/buildroot/package/comix-cursors/Config.in
similarity index 100%
rename from software/package/comix-cursors/Config.in
rename to buildroot/package/comix-cursors/Config.in
diff --git a/software/package/comix-cursors/comix-cursors.hash b/buildroot/package/comix-cursors/comix-cursors.hash
similarity index 100%
rename from software/package/comix-cursors/comix-cursors.hash
rename to buildroot/package/comix-cursors/comix-cursors.hash
diff --git a/software/package/comix-cursors/comix-cursors.mk b/buildroot/package/comix-cursors/comix-cursors.mk
similarity index 100%
rename from software/package/comix-cursors/comix-cursors.mk
rename to buildroot/package/comix-cursors/comix-cursors.mk
diff --git a/software/package/connman-gtk/Config.in b/buildroot/package/connman-gtk/Config.in
similarity index 100%
rename from software/package/connman-gtk/Config.in
rename to buildroot/package/connman-gtk/Config.in
diff --git a/software/package/connman-gtk/connman-gtk.hash b/buildroot/package/connman-gtk/connman-gtk.hash
similarity index 100%
rename from software/package/connman-gtk/connman-gtk.hash
rename to buildroot/package/connman-gtk/connman-gtk.hash
diff --git a/software/package/connman-gtk/connman-gtk.mk b/buildroot/package/connman-gtk/connman-gtk.mk
similarity index 100%
rename from software/package/connman-gtk/connman-gtk.mk
rename to buildroot/package/connman-gtk/connman-gtk.mk
diff --git a/software/package/connman/0001-nat-build-failure.patch b/buildroot/package/connman/0001-nat-build-failure.patch
similarity index 100%
rename from software/package/connman/0001-nat-build-failure.patch
rename to buildroot/package/connman/0001-nat-build-failure.patch
diff --git a/software/package/connman/Config.in b/buildroot/package/connman/Config.in
similarity index 100%
rename from software/package/connman/Config.in
rename to buildroot/package/connman/Config.in
diff --git a/software/package/connman/S45connman b/buildroot/package/connman/S45connman
similarity index 100%
rename from software/package/connman/S45connman
rename to buildroot/package/connman/S45connman
diff --git a/software/package/connman/connman.hash b/buildroot/package/connman/connman.hash
similarity index 100%
rename from software/package/connman/connman.hash
rename to buildroot/package/connman/connman.hash
diff --git a/software/package/connman/connman.mk b/buildroot/package/connman/connman.mk
similarity index 100%
rename from software/package/connman/connman.mk
rename to buildroot/package/connman/connman.mk
diff --git a/software/package/conntrack-tools/Config.in b/buildroot/package/conntrack-tools/Config.in
similarity index 100%
rename from software/package/conntrack-tools/Config.in
rename to buildroot/package/conntrack-tools/Config.in
diff --git a/software/package/conntrack-tools/conntrack-tools.hash b/buildroot/package/conntrack-tools/conntrack-tools.hash
similarity index 100%
rename from software/package/conntrack-tools/conntrack-tools.hash
rename to buildroot/package/conntrack-tools/conntrack-tools.hash
diff --git a/software/package/conntrack-tools/conntrack-tools.mk b/buildroot/package/conntrack-tools/conntrack-tools.mk
similarity index 100%
rename from software/package/conntrack-tools/conntrack-tools.mk
rename to buildroot/package/conntrack-tools/conntrack-tools.mk
diff --git a/software/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch b/buildroot/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
similarity index 100%
rename from software/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
rename to buildroot/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
diff --git a/software/package/copas/Config.in b/buildroot/package/copas/Config.in
similarity index 100%
rename from software/package/copas/Config.in
rename to buildroot/package/copas/Config.in
diff --git a/software/package/copas/copas.hash b/buildroot/package/copas/copas.hash
similarity index 100%
rename from software/package/copas/copas.hash
rename to buildroot/package/copas/copas.hash
diff --git a/software/package/copas/copas.mk b/buildroot/package/copas/copas.mk
similarity index 100%
rename from software/package/copas/copas.mk
rename to buildroot/package/copas/copas.mk
diff --git a/software/package/coreutils/0001-strtod_fix_clash_with_strtold.patch b/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch
similarity index 100%
rename from software/package/coreutils/0001-strtod_fix_clash_with_strtold.patch
rename to buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch
diff --git a/software/package/coreutils/Config.in b/buildroot/package/coreutils/Config.in
similarity index 100%
rename from software/package/coreutils/Config.in
rename to buildroot/package/coreutils/Config.in
diff --git a/software/package/coreutils/coreutils.hash b/buildroot/package/coreutils/coreutils.hash
similarity index 100%
rename from software/package/coreutils/coreutils.hash
rename to buildroot/package/coreutils/coreutils.hash
diff --git a/software/package/coreutils/coreutils.mk b/buildroot/package/coreutils/coreutils.mk
similarity index 100%
rename from software/package/coreutils/coreutils.mk
rename to buildroot/package/coreutils/coreutils.mk
diff --git a/software/package/corkscrew/Config.in b/buildroot/package/corkscrew/Config.in
similarity index 100%
rename from software/package/corkscrew/Config.in
rename to buildroot/package/corkscrew/Config.in
diff --git a/software/package/corkscrew/corkscrew.hash b/buildroot/package/corkscrew/corkscrew.hash
similarity index 100%
rename from software/package/corkscrew/corkscrew.hash
rename to buildroot/package/corkscrew/corkscrew.hash
diff --git a/software/package/corkscrew/corkscrew.mk b/buildroot/package/corkscrew/corkscrew.mk
similarity index 100%
rename from software/package/corkscrew/corkscrew.mk
rename to buildroot/package/corkscrew/corkscrew.mk
diff --git a/software/package/coxpcall/Config.in b/buildroot/package/coxpcall/Config.in
similarity index 100%
rename from software/package/coxpcall/Config.in
rename to buildroot/package/coxpcall/Config.in
diff --git a/software/package/coxpcall/coxpcall.hash b/buildroot/package/coxpcall/coxpcall.hash
similarity index 100%
rename from software/package/coxpcall/coxpcall.hash
rename to buildroot/package/coxpcall/coxpcall.hash
diff --git a/software/package/coxpcall/coxpcall.mk b/buildroot/package/coxpcall/coxpcall.mk
similarity index 100%
rename from software/package/coxpcall/coxpcall.mk
rename to buildroot/package/coxpcall/coxpcall.mk
diff --git a/software/package/cpio/0001-Minor-fix.patch b/buildroot/package/cpio/0001-Minor-fix.patch
similarity index 100%
rename from software/package/cpio/0001-Minor-fix.patch
rename to buildroot/package/cpio/0001-Minor-fix.patch
diff --git a/software/package/cpio/Config.in b/buildroot/package/cpio/Config.in
similarity index 100%
rename from software/package/cpio/Config.in
rename to buildroot/package/cpio/Config.in
diff --git a/software/package/cpio/cpio.hash b/buildroot/package/cpio/cpio.hash
similarity index 100%
rename from software/package/cpio/cpio.hash
rename to buildroot/package/cpio/cpio.hash
diff --git a/software/package/cpio/cpio.mk b/buildroot/package/cpio/cpio.mk
similarity index 100%
rename from software/package/cpio/cpio.mk
rename to buildroot/package/cpio/cpio.mk
diff --git a/software/package/cppcms/Config.in b/buildroot/package/cppcms/Config.in
similarity index 100%
rename from software/package/cppcms/Config.in
rename to buildroot/package/cppcms/Config.in
diff --git a/software/package/cppcms/cppcms.hash b/buildroot/package/cppcms/cppcms.hash
similarity index 100%
rename from software/package/cppcms/cppcms.hash
rename to buildroot/package/cppcms/cppcms.hash
diff --git a/software/package/cppcms/cppcms.mk b/buildroot/package/cppcms/cppcms.mk
similarity index 100%
rename from software/package/cppcms/cppcms.mk
rename to buildroot/package/cppcms/cppcms.mk
diff --git a/software/package/cppdb/0001-mysql-library-suffix.patch b/buildroot/package/cppdb/0001-mysql-library-suffix.patch
similarity index 100%
rename from software/package/cppdb/0001-mysql-library-suffix.patch
rename to buildroot/package/cppdb/0001-mysql-library-suffix.patch
diff --git a/software/package/cppdb/Config.in b/buildroot/package/cppdb/Config.in
similarity index 100%
rename from software/package/cppdb/Config.in
rename to buildroot/package/cppdb/Config.in
diff --git a/software/package/cppdb/cppdb.hash b/buildroot/package/cppdb/cppdb.hash
similarity index 100%
rename from software/package/cppdb/cppdb.hash
rename to buildroot/package/cppdb/cppdb.hash
diff --git a/software/package/cppdb/cppdb.mk b/buildroot/package/cppdb/cppdb.mk
similarity index 100%
rename from software/package/cppdb/cppdb.mk
rename to buildroot/package/cppdb/cppdb.mk
diff --git a/software/package/cppunit/Config.in b/buildroot/package/cppunit/Config.in
similarity index 100%
rename from software/package/cppunit/Config.in
rename to buildroot/package/cppunit/Config.in
diff --git a/software/package/cppunit/cppunit.hash b/buildroot/package/cppunit/cppunit.hash
similarity index 100%
rename from software/package/cppunit/cppunit.hash
rename to buildroot/package/cppunit/cppunit.hash
diff --git a/software/package/cppunit/cppunit.mk b/buildroot/package/cppunit/cppunit.mk
similarity index 100%
rename from software/package/cppunit/cppunit.mk
rename to buildroot/package/cppunit/cppunit.mk
diff --git a/software/package/cppzmq/Config.in b/buildroot/package/cppzmq/Config.in
similarity index 100%
rename from software/package/cppzmq/Config.in
rename to buildroot/package/cppzmq/Config.in
diff --git a/software/package/cppzmq/cppzmq.hash b/buildroot/package/cppzmq/cppzmq.hash
similarity index 100%
rename from software/package/cppzmq/cppzmq.hash
rename to buildroot/package/cppzmq/cppzmq.hash
diff --git a/software/package/cppzmq/cppzmq.mk b/buildroot/package/cppzmq/cppzmq.mk
similarity index 100%
rename from software/package/cppzmq/cppzmq.mk
rename to buildroot/package/cppzmq/cppzmq.mk
diff --git a/software/package/cpuburn-arm/Config.in b/buildroot/package/cpuburn-arm/Config.in
similarity index 100%
rename from software/package/cpuburn-arm/Config.in
rename to buildroot/package/cpuburn-arm/Config.in
diff --git a/software/package/cpuburn-arm/cpuburn-arm.hash b/buildroot/package/cpuburn-arm/cpuburn-arm.hash
similarity index 100%
rename from software/package/cpuburn-arm/cpuburn-arm.hash
rename to buildroot/package/cpuburn-arm/cpuburn-arm.hash
diff --git a/software/package/cpuburn-arm/cpuburn-arm.mk b/buildroot/package/cpuburn-arm/cpuburn-arm.mk
similarity index 100%
rename from software/package/cpuburn-arm/cpuburn-arm.mk
rename to buildroot/package/cpuburn-arm/cpuburn-arm.mk
diff --git a/software/package/cpuload/Config.in b/buildroot/package/cpuload/Config.in
similarity index 100%
rename from software/package/cpuload/Config.in
rename to buildroot/package/cpuload/Config.in
diff --git a/software/package/cpuload/cpuload.hash b/buildroot/package/cpuload/cpuload.hash
similarity index 100%
rename from software/package/cpuload/cpuload.hash
rename to buildroot/package/cpuload/cpuload.hash
diff --git a/software/package/cpuload/cpuload.mk b/buildroot/package/cpuload/cpuload.mk
similarity index 100%
rename from software/package/cpuload/cpuload.mk
rename to buildroot/package/cpuload/cpuload.mk
diff --git a/software/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch b/buildroot/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch
similarity index 100%
rename from software/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch
rename to buildroot/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch
diff --git a/software/package/cracklib/Config.in b/buildroot/package/cracklib/Config.in
similarity index 100%
rename from software/package/cracklib/Config.in
rename to buildroot/package/cracklib/Config.in
diff --git a/software/package/cracklib/cracklib.hash b/buildroot/package/cracklib/cracklib.hash
similarity index 100%
rename from software/package/cracklib/cracklib.hash
rename to buildroot/package/cracklib/cracklib.hash
diff --git a/software/package/cracklib/cracklib.mk b/buildroot/package/cracklib/cracklib.mk
similarity index 100%
rename from software/package/cracklib/cracklib.mk
rename to buildroot/package/cracklib/cracklib.mk
diff --git a/software/package/cramfs/Config.in b/buildroot/package/cramfs/Config.in
similarity index 100%
rename from software/package/cramfs/Config.in
rename to buildroot/package/cramfs/Config.in
diff --git a/software/package/cramfs/Config.in.host b/buildroot/package/cramfs/Config.in.host
similarity index 100%
rename from software/package/cramfs/Config.in.host
rename to buildroot/package/cramfs/Config.in.host
diff --git a/software/package/cramfs/cramfs.hash b/buildroot/package/cramfs/cramfs.hash
similarity index 100%
rename from software/package/cramfs/cramfs.hash
rename to buildroot/package/cramfs/cramfs.hash
diff --git a/software/package/cramfs/cramfs.mk b/buildroot/package/cramfs/cramfs.mk
similarity index 100%
rename from software/package/cramfs/cramfs.mk
rename to buildroot/package/cramfs/cramfs.mk
diff --git a/software/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/buildroot/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
similarity index 100%
rename from software/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
rename to buildroot/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
diff --git a/software/package/crda/0002-drop-ldconfig-call.patch b/buildroot/package/crda/0002-drop-ldconfig-call.patch
similarity index 100%
rename from software/package/crda/0002-drop-ldconfig-call.patch
rename to buildroot/package/crda/0002-drop-ldconfig-call.patch
diff --git a/software/package/crda/0003-drop-werror.patch b/buildroot/package/crda/0003-drop-werror.patch
similarity index 100%
rename from software/package/crda/0003-drop-werror.patch
rename to buildroot/package/crda/0003-drop-werror.patch
diff --git a/software/package/crda/Config.in b/buildroot/package/crda/Config.in
similarity index 100%
rename from software/package/crda/Config.in
rename to buildroot/package/crda/Config.in
diff --git a/software/package/crda/crda.hash b/buildroot/package/crda/crda.hash
similarity index 100%
rename from software/package/crda/crda.hash
rename to buildroot/package/crda/crda.hash
diff --git a/software/package/crda/crda.mk b/buildroot/package/crda/crda.mk
similarity index 100%
rename from software/package/crda/crda.mk
rename to buildroot/package/crda/crda.mk
diff --git a/software/package/crudini/Config.in b/buildroot/package/crudini/Config.in
similarity index 100%
rename from software/package/crudini/Config.in
rename to buildroot/package/crudini/Config.in
diff --git a/software/package/crudini/crudini.hash b/buildroot/package/crudini/crudini.hash
similarity index 100%
rename from software/package/crudini/crudini.hash
rename to buildroot/package/crudini/crudini.hash
diff --git a/software/package/crudini/crudini.mk b/buildroot/package/crudini/crudini.mk
similarity index 100%
rename from software/package/crudini/crudini.mk
rename to buildroot/package/crudini/crudini.mk
diff --git a/software/package/cryptodev-linux/cryptodev-linux.hash b/buildroot/package/cryptodev-linux/cryptodev-linux.hash
similarity index 100%
rename from software/package/cryptodev-linux/cryptodev-linux.hash
rename to buildroot/package/cryptodev-linux/cryptodev-linux.hash
diff --git a/software/package/cryptodev-linux/cryptodev-linux.mk b/buildroot/package/cryptodev-linux/cryptodev-linux.mk
similarity index 100%
rename from software/package/cryptodev-linux/cryptodev-linux.mk
rename to buildroot/package/cryptodev-linux/cryptodev-linux.mk
diff --git a/software/package/cryptodev/Config.in b/buildroot/package/cryptodev/Config.in
similarity index 100%
rename from software/package/cryptodev/Config.in
rename to buildroot/package/cryptodev/Config.in
diff --git a/software/package/cryptodev/cryptodev.mk b/buildroot/package/cryptodev/cryptodev.mk
similarity index 100%
rename from software/package/cryptodev/cryptodev.mk
rename to buildroot/package/cryptodev/cryptodev.mk
diff --git a/software/package/cryptopp/cryptopp.hash b/buildroot/package/cryptopp/cryptopp.hash
similarity index 100%
rename from software/package/cryptopp/cryptopp.hash
rename to buildroot/package/cryptopp/cryptopp.hash
diff --git a/software/package/cryptopp/cryptopp.mk b/buildroot/package/cryptopp/cryptopp.mk
similarity index 100%
rename from software/package/cryptopp/cryptopp.mk
rename to buildroot/package/cryptopp/cryptopp.mk
diff --git a/software/package/cryptsetup/0001-Remove-json_object-typedef.patch b/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch
similarity index 100%
rename from software/package/cryptsetup/0001-Remove-json_object-typedef.patch
rename to buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch
diff --git a/software/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch b/buildroot/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch
similarity index 100%
rename from software/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch
rename to buildroot/package/cryptsetup/0002-Add-support-for-upcoming-json-c-0.14.0.patch
diff --git a/software/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch b/buildroot/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch
similarity index 100%
rename from software/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch
rename to buildroot/package/cryptsetup/0003-Avoid-name-clash-with-newer-json-c-library.patch
diff --git a/software/package/cryptsetup/Config.in b/buildroot/package/cryptsetup/Config.in
similarity index 100%
rename from software/package/cryptsetup/Config.in
rename to buildroot/package/cryptsetup/Config.in
diff --git a/software/package/cryptsetup/Config.in.host b/buildroot/package/cryptsetup/Config.in.host
similarity index 100%
rename from software/package/cryptsetup/Config.in.host
rename to buildroot/package/cryptsetup/Config.in.host
diff --git a/software/package/cryptsetup/cryptsetup.hash b/buildroot/package/cryptsetup/cryptsetup.hash
similarity index 100%
rename from software/package/cryptsetup/cryptsetup.hash
rename to buildroot/package/cryptsetup/cryptsetup.hash
diff --git a/software/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk
similarity index 100%
rename from software/package/cryptsetup/cryptsetup.mk
rename to buildroot/package/cryptsetup/cryptsetup.mk
diff --git a/software/package/ctorrent/0001-fix-musl-build.patch b/buildroot/package/ctorrent/0001-fix-musl-build.patch
similarity index 100%
rename from software/package/ctorrent/0001-fix-musl-build.patch
rename to buildroot/package/ctorrent/0001-fix-musl-build.patch
diff --git a/software/package/ctorrent/Config.in b/buildroot/package/ctorrent/Config.in
similarity index 100%
rename from software/package/ctorrent/Config.in
rename to buildroot/package/ctorrent/Config.in
diff --git a/software/package/ctorrent/ctorrent.hash b/buildroot/package/ctorrent/ctorrent.hash
similarity index 100%
rename from software/package/ctorrent/ctorrent.hash
rename to buildroot/package/ctorrent/ctorrent.hash
diff --git a/software/package/ctorrent/ctorrent.mk b/buildroot/package/ctorrent/ctorrent.mk
similarity index 100%
rename from software/package/ctorrent/ctorrent.mk
rename to buildroot/package/ctorrent/ctorrent.mk
diff --git a/software/package/cunit/Config.in b/buildroot/package/cunit/Config.in
similarity index 100%
rename from software/package/cunit/Config.in
rename to buildroot/package/cunit/Config.in
diff --git a/software/package/cunit/cunit.hash b/buildroot/package/cunit/cunit.hash
similarity index 100%
rename from software/package/cunit/cunit.hash
rename to buildroot/package/cunit/cunit.hash
diff --git a/software/package/cunit/cunit.mk b/buildroot/package/cunit/cunit.mk
similarity index 100%
rename from software/package/cunit/cunit.mk
rename to buildroot/package/cunit/cunit.mk
diff --git a/software/package/cups-filters/Config.in b/buildroot/package/cups-filters/Config.in
similarity index 100%
rename from software/package/cups-filters/Config.in
rename to buildroot/package/cups-filters/Config.in
diff --git a/software/package/cups-filters/cups-filters.hash b/buildroot/package/cups-filters/cups-filters.hash
similarity index 100%
rename from software/package/cups-filters/cups-filters.hash
rename to buildroot/package/cups-filters/cups-filters.hash
diff --git a/software/package/cups-filters/cups-filters.mk b/buildroot/package/cups-filters/cups-filters.mk
similarity index 100%
rename from software/package/cups-filters/cups-filters.mk
rename to buildroot/package/cups-filters/cups-filters.mk
diff --git a/software/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/buildroot/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch
similarity index 100%
rename from software/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch
rename to buildroot/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch
diff --git a/software/package/cups/0002-Do-not-use-genstrings.patch b/buildroot/package/cups/0002-Do-not-use-genstrings.patch
similarity index 100%
rename from software/package/cups/0002-Do-not-use-genstrings.patch
rename to buildroot/package/cups/0002-Do-not-use-genstrings.patch
diff --git a/software/package/cups/0003-Sanitize-the-installation-process.patch b/buildroot/package/cups/0003-Sanitize-the-installation-process.patch
similarity index 100%
rename from software/package/cups/0003-Sanitize-the-installation-process.patch
rename to buildroot/package/cups/0003-Sanitize-the-installation-process.patch
diff --git a/software/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch
similarity index 100%
rename from software/package/cups/0004-Remove-PIE-flags-from-the-build.patch
rename to buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch
diff --git a/software/package/cups/70-usb-printers.rules b/buildroot/package/cups/70-usb-printers.rules
similarity index 100%
rename from software/package/cups/70-usb-printers.rules
rename to buildroot/package/cups/70-usb-printers.rules
diff --git a/software/package/cups/Config.in b/buildroot/package/cups/Config.in
similarity index 100%
rename from software/package/cups/Config.in
rename to buildroot/package/cups/Config.in
diff --git a/software/package/cups/S81cupsd b/buildroot/package/cups/S81cupsd
similarity index 100%
rename from software/package/cups/S81cupsd
rename to buildroot/package/cups/S81cupsd
diff --git a/software/package/cups/cups.hash b/buildroot/package/cups/cups.hash
similarity index 100%
rename from software/package/cups/cups.hash
rename to buildroot/package/cups/cups.hash
diff --git a/software/package/cups/cups.mk b/buildroot/package/cups/cups.mk
similarity index 100%
rename from software/package/cups/cups.mk
rename to buildroot/package/cups/cups.mk
diff --git a/software/package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch b/buildroot/package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch
similarity index 100%
rename from software/package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch
rename to buildroot/package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch
diff --git a/software/package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch b/buildroot/package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch
similarity index 100%
rename from software/package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch
rename to buildroot/package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch
diff --git a/software/package/curlftpfs/0003-nocache-memleak-fix.patch b/buildroot/package/curlftpfs/0003-nocache-memleak-fix.patch
similarity index 100%
rename from software/package/curlftpfs/0003-nocache-memleak-fix.patch
rename to buildroot/package/curlftpfs/0003-nocache-memleak-fix.patch
diff --git a/software/package/curlftpfs/0004-fix-musl-build-off-t.patch b/buildroot/package/curlftpfs/0004-fix-musl-build-off-t.patch
similarity index 100%
rename from software/package/curlftpfs/0004-fix-musl-build-off-t.patch
rename to buildroot/package/curlftpfs/0004-fix-musl-build-off-t.patch
diff --git a/software/package/curlftpfs/Config.in b/buildroot/package/curlftpfs/Config.in
similarity index 100%
rename from software/package/curlftpfs/Config.in
rename to buildroot/package/curlftpfs/Config.in
diff --git a/software/package/curlftpfs/curlftpfs.hash b/buildroot/package/curlftpfs/curlftpfs.hash
similarity index 100%
rename from software/package/curlftpfs/curlftpfs.hash
rename to buildroot/package/curlftpfs/curlftpfs.hash
diff --git a/software/package/curlftpfs/curlftpfs.mk b/buildroot/package/curlftpfs/curlftpfs.mk
similarity index 100%
rename from software/package/curlftpfs/curlftpfs.mk
rename to buildroot/package/curlftpfs/curlftpfs.mk
diff --git a/software/package/curlpp/Config.in b/buildroot/package/curlpp/Config.in
similarity index 100%
rename from software/package/curlpp/Config.in
rename to buildroot/package/curlpp/Config.in
diff --git a/software/package/curlpp/curlpp.hash b/buildroot/package/curlpp/curlpp.hash
similarity index 100%
rename from software/package/curlpp/curlpp.hash
rename to buildroot/package/curlpp/curlpp.hash
diff --git a/software/package/curlpp/curlpp.mk b/buildroot/package/curlpp/curlpp.mk
similarity index 100%
rename from software/package/curlpp/curlpp.mk
rename to buildroot/package/curlpp/curlpp.mk
diff --git a/software/package/cutelyst/Config.in b/buildroot/package/cutelyst/Config.in
similarity index 100%
rename from software/package/cutelyst/Config.in
rename to buildroot/package/cutelyst/Config.in
diff --git a/software/package/cutelyst/cutelyst.hash b/buildroot/package/cutelyst/cutelyst.hash
similarity index 100%
rename from software/package/cutelyst/cutelyst.hash
rename to buildroot/package/cutelyst/cutelyst.hash
diff --git a/software/package/cutelyst/cutelyst.mk b/buildroot/package/cutelyst/cutelyst.mk
similarity index 100%
rename from software/package/cutelyst/cutelyst.mk
rename to buildroot/package/cutelyst/cutelyst.mk
diff --git a/software/package/cvs/Config.in b/buildroot/package/cvs/Config.in
similarity index 100%
rename from software/package/cvs/Config.in
rename to buildroot/package/cvs/Config.in
diff --git a/software/package/cvs/cvs.hash b/buildroot/package/cvs/cvs.hash
similarity index 100%
rename from software/package/cvs/cvs.hash
rename to buildroot/package/cvs/cvs.hash
diff --git a/software/package/cvs/cvs.mk b/buildroot/package/cvs/cvs.mk
similarity index 100%
rename from software/package/cvs/cvs.mk
rename to buildroot/package/cvs/cvs.mk
diff --git a/software/package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch b/buildroot/package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch
similarity index 100%
rename from software/package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch
rename to buildroot/package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch
diff --git a/software/package/cwiid/0002-configure-make-wmgui-build-optional.patch b/buildroot/package/cwiid/0002-configure-make-wmgui-build-optional.patch
similarity index 100%
rename from software/package/cwiid/0002-configure-make-wmgui-build-optional.patch
rename to buildroot/package/cwiid/0002-configure-make-wmgui-build-optional.patch
diff --git a/software/package/cwiid/Config.in b/buildroot/package/cwiid/Config.in
similarity index 100%
rename from software/package/cwiid/Config.in
rename to buildroot/package/cwiid/Config.in
diff --git a/software/package/cwiid/cwiid.hash b/buildroot/package/cwiid/cwiid.hash
similarity index 100%
rename from software/package/cwiid/cwiid.hash
rename to buildroot/package/cwiid/cwiid.hash
diff --git a/software/package/cwiid/cwiid.mk b/buildroot/package/cwiid/cwiid.mk
similarity index 100%
rename from software/package/cwiid/cwiid.mk
rename to buildroot/package/cwiid/cwiid.mk
diff --git a/software/package/cxxtest/Config.in b/buildroot/package/cxxtest/Config.in
similarity index 100%
rename from software/package/cxxtest/Config.in
rename to buildroot/package/cxxtest/Config.in
diff --git a/software/package/cxxtest/cxxtest.hash b/buildroot/package/cxxtest/cxxtest.hash
similarity index 100%
rename from software/package/cxxtest/cxxtest.hash
rename to buildroot/package/cxxtest/cxxtest.hash
diff --git a/software/package/cxxtest/cxxtest.mk b/buildroot/package/cxxtest/cxxtest.mk
similarity index 100%
rename from software/package/cxxtest/cxxtest.mk
rename to buildroot/package/cxxtest/cxxtest.mk
diff --git a/software/package/czmq/Config.in b/buildroot/package/czmq/Config.in
similarity index 100%
rename from software/package/czmq/Config.in
rename to buildroot/package/czmq/Config.in
diff --git a/software/package/czmq/czmq.hash b/buildroot/package/czmq/czmq.hash
similarity index 100%
rename from software/package/czmq/czmq.hash
rename to buildroot/package/czmq/czmq.hash
diff --git a/software/package/czmq/czmq.mk b/buildroot/package/czmq/czmq.mk
similarity index 100%
rename from software/package/czmq/czmq.mk
rename to buildroot/package/czmq/czmq.mk
diff --git a/software/package/dacapo/Config.in b/buildroot/package/dacapo/Config.in
similarity index 100%
rename from software/package/dacapo/Config.in
rename to buildroot/package/dacapo/Config.in
diff --git a/software/package/dacapo/dacapo.hash b/buildroot/package/dacapo/dacapo.hash
similarity index 100%
rename from software/package/dacapo/dacapo.hash
rename to buildroot/package/dacapo/dacapo.hash
diff --git a/software/package/dacapo/dacapo.mk b/buildroot/package/dacapo/dacapo.mk
similarity index 100%
rename from software/package/dacapo/dacapo.mk
rename to buildroot/package/dacapo/dacapo.mk
diff --git a/software/package/dado/Config.in b/buildroot/package/dado/Config.in
similarity index 100%
rename from software/package/dado/Config.in
rename to buildroot/package/dado/Config.in
diff --git a/software/package/dado/dado.hash b/buildroot/package/dado/dado.hash
similarity index 100%
rename from software/package/dado/dado.hash
rename to buildroot/package/dado/dado.hash
diff --git a/software/package/dado/dado.mk b/buildroot/package/dado/dado.mk
similarity index 100%
rename from software/package/dado/dado.mk
rename to buildroot/package/dado/dado.mk
diff --git a/software/package/daemon/0001-fix-musl.patch b/buildroot/package/daemon/0001-fix-musl.patch
similarity index 100%
rename from software/package/daemon/0001-fix-musl.patch
rename to buildroot/package/daemon/0001-fix-musl.patch
diff --git a/software/package/daemon/Config.in b/buildroot/package/daemon/Config.in
similarity index 100%
rename from software/package/daemon/Config.in
rename to buildroot/package/daemon/Config.in
diff --git a/software/package/daemon/daemon.hash b/buildroot/package/daemon/daemon.hash
similarity index 100%
rename from software/package/daemon/daemon.hash
rename to buildroot/package/daemon/daemon.hash
diff --git a/software/package/daemon/daemon.mk b/buildroot/package/daemon/daemon.mk
similarity index 100%
rename from software/package/daemon/daemon.mk
rename to buildroot/package/daemon/daemon.mk
diff --git a/software/package/dahdi-linux/Config.in b/buildroot/package/dahdi-linux/Config.in
similarity index 100%
rename from software/package/dahdi-linux/Config.in
rename to buildroot/package/dahdi-linux/Config.in
diff --git a/software/package/dahdi-linux/dahdi-linux.hash b/buildroot/package/dahdi-linux/dahdi-linux.hash
similarity index 100%
rename from software/package/dahdi-linux/dahdi-linux.hash
rename to buildroot/package/dahdi-linux/dahdi-linux.hash
diff --git a/software/package/dahdi-linux/dahdi-linux.mk b/buildroot/package/dahdi-linux/dahdi-linux.mk
similarity index 100%
rename from software/package/dahdi-linux/dahdi-linux.mk
rename to buildroot/package/dahdi-linux/dahdi-linux.mk
diff --git a/software/package/dahdi-tools/0001-no-build-docs.patch b/buildroot/package/dahdi-tools/0001-no-build-docs.patch
similarity index 100%
rename from software/package/dahdi-tools/0001-no-build-docs.patch
rename to buildroot/package/dahdi-tools/0001-no-build-docs.patch
diff --git a/software/package/dahdi-tools/0002-no-perl-manpages.patch b/buildroot/package/dahdi-tools/0002-no-perl-manpages.patch
similarity index 100%
rename from software/package/dahdi-tools/0002-no-perl-manpages.patch
rename to buildroot/package/dahdi-tools/0002-no-perl-manpages.patch
diff --git a/software/package/dahdi-tools/Config.in b/buildroot/package/dahdi-tools/Config.in
similarity index 100%
rename from software/package/dahdi-tools/Config.in
rename to buildroot/package/dahdi-tools/Config.in
diff --git a/software/package/dahdi-tools/dahdi-tools.hash b/buildroot/package/dahdi-tools/dahdi-tools.hash
similarity index 100%
rename from software/package/dahdi-tools/dahdi-tools.hash
rename to buildroot/package/dahdi-tools/dahdi-tools.hash
diff --git a/software/package/dahdi-tools/dahdi-tools.mk b/buildroot/package/dahdi-tools/dahdi-tools.mk
similarity index 100%
rename from software/package/dahdi-tools/dahdi-tools.mk
rename to buildroot/package/dahdi-tools/dahdi-tools.mk
diff --git a/software/package/dante/0001-fix-sparc-compile.patch b/buildroot/package/dante/0001-fix-sparc-compile.patch
similarity index 100%
rename from software/package/dante/0001-fix-sparc-compile.patch
rename to buildroot/package/dante/0001-fix-sparc-compile.patch
diff --git a/software/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch b/buildroot/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch
similarity index 100%
rename from software/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch
rename to buildroot/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch
diff --git a/software/package/dante/Config.in b/buildroot/package/dante/Config.in
similarity index 100%
rename from software/package/dante/Config.in
rename to buildroot/package/dante/Config.in
diff --git a/software/package/dante/S50dante b/buildroot/package/dante/S50dante
similarity index 100%
rename from software/package/dante/S50dante
rename to buildroot/package/dante/S50dante
diff --git a/software/package/dante/dante.hash b/buildroot/package/dante/dante.hash
similarity index 100%
rename from software/package/dante/dante.hash
rename to buildroot/package/dante/dante.hash
diff --git a/software/package/dante/dante.mk b/buildroot/package/dante/dante.mk
similarity index 100%
rename from software/package/dante/dante.mk
rename to buildroot/package/dante/dante.mk
diff --git a/software/package/dante/dante.service b/buildroot/package/dante/dante.service
similarity index 100%
rename from software/package/dante/dante.service
rename to buildroot/package/dante/dante.service
diff --git a/software/package/daq/0001-Fix-build-against-the-musl-C-library.patch b/buildroot/package/daq/0001-Fix-build-against-the-musl-C-library.patch
similarity index 100%
rename from software/package/daq/0001-Fix-build-against-the-musl-C-library.patch
rename to buildroot/package/daq/0001-Fix-build-against-the-musl-C-library.patch
diff --git a/software/package/daq/Config.in b/buildroot/package/daq/Config.in
similarity index 100%
rename from software/package/daq/Config.in
rename to buildroot/package/daq/Config.in
diff --git a/software/package/daq/daq.hash b/buildroot/package/daq/daq.hash
similarity index 100%
rename from software/package/daq/daq.hash
rename to buildroot/package/daq/daq.hash
diff --git a/software/package/daq/daq.mk b/buildroot/package/daq/daq.mk
similarity index 100%
rename from software/package/daq/daq.mk
rename to buildroot/package/daq/daq.mk
diff --git a/software/package/darkhttpd/Config.in b/buildroot/package/darkhttpd/Config.in
similarity index 100%
rename from software/package/darkhttpd/Config.in
rename to buildroot/package/darkhttpd/Config.in
diff --git a/software/package/darkhttpd/S50darkhttpd b/buildroot/package/darkhttpd/S50darkhttpd
similarity index 100%
rename from software/package/darkhttpd/S50darkhttpd
rename to buildroot/package/darkhttpd/S50darkhttpd
diff --git a/software/package/darkhttpd/darkhttpd.hash b/buildroot/package/darkhttpd/darkhttpd.hash
similarity index 100%
rename from software/package/darkhttpd/darkhttpd.hash
rename to buildroot/package/darkhttpd/darkhttpd.hash
diff --git a/software/package/darkhttpd/darkhttpd.mk b/buildroot/package/darkhttpd/darkhttpd.mk
similarity index 100%
rename from software/package/darkhttpd/darkhttpd.mk
rename to buildroot/package/darkhttpd/darkhttpd.mk
diff --git a/software/package/darkhttpd/darkhttpd.service b/buildroot/package/darkhttpd/darkhttpd.service
similarity index 100%
rename from software/package/darkhttpd/darkhttpd.service
rename to buildroot/package/darkhttpd/darkhttpd.service
diff --git a/software/package/dash/0001-no-config.h-for-helpers.patch b/buildroot/package/dash/0001-no-config.h-for-helpers.patch
similarity index 100%
rename from software/package/dash/0001-no-config.h-for-helpers.patch
rename to buildroot/package/dash/0001-no-config.h-for-helpers.patch
diff --git a/software/package/dash/Config.in b/buildroot/package/dash/Config.in
similarity index 100%
rename from software/package/dash/Config.in
rename to buildroot/package/dash/Config.in
diff --git a/software/package/dash/dash.hash b/buildroot/package/dash/dash.hash
similarity index 100%
rename from software/package/dash/dash.hash
rename to buildroot/package/dash/dash.hash
diff --git a/software/package/dash/dash.mk b/buildroot/package/dash/dash.mk
similarity index 100%
rename from software/package/dash/dash.mk
rename to buildroot/package/dash/dash.mk
diff --git a/software/package/dav1d/Config.in b/buildroot/package/dav1d/Config.in
similarity index 100%
rename from software/package/dav1d/Config.in
rename to buildroot/package/dav1d/Config.in
diff --git a/software/package/dav1d/dav1d.hash b/buildroot/package/dav1d/dav1d.hash
similarity index 100%
rename from software/package/dav1d/dav1d.hash
rename to buildroot/package/dav1d/dav1d.hash
diff --git a/software/package/dav1d/dav1d.mk b/buildroot/package/dav1d/dav1d.mk
similarity index 100%
rename from software/package/dav1d/dav1d.mk
rename to buildroot/package/dav1d/dav1d.mk
diff --git a/software/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch b/buildroot/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch
similarity index 100%
rename from software/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch
rename to buildroot/package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch
diff --git a/software/package/davfs2/0002-fix-iconv.patch b/buildroot/package/davfs2/0002-fix-iconv.patch
similarity index 100%
rename from software/package/davfs2/0002-fix-iconv.patch
rename to buildroot/package/davfs2/0002-fix-iconv.patch
diff --git a/software/package/davfs2/Config.in b/buildroot/package/davfs2/Config.in
similarity index 100%
rename from software/package/davfs2/Config.in
rename to buildroot/package/davfs2/Config.in
diff --git a/software/package/davfs2/davfs2.hash b/buildroot/package/davfs2/davfs2.hash
similarity index 100%
rename from software/package/davfs2/davfs2.hash
rename to buildroot/package/davfs2/davfs2.hash
diff --git a/software/package/davfs2/davfs2.mk b/buildroot/package/davfs2/davfs2.mk
similarity index 100%
rename from software/package/davfs2/davfs2.mk
rename to buildroot/package/davfs2/davfs2.mk
diff --git a/software/package/davici/Config.in b/buildroot/package/davici/Config.in
similarity index 100%
rename from software/package/davici/Config.in
rename to buildroot/package/davici/Config.in
diff --git a/software/package/davici/davici.hash b/buildroot/package/davici/davici.hash
similarity index 100%
rename from software/package/davici/davici.hash
rename to buildroot/package/davici/davici.hash
diff --git a/software/package/davici/davici.mk b/buildroot/package/davici/davici.mk
similarity index 100%
rename from software/package/davici/davici.mk
rename to buildroot/package/davici/davici.mk
diff --git a/software/package/dawgdic/Config.in b/buildroot/package/dawgdic/Config.in
similarity index 100%
rename from software/package/dawgdic/Config.in
rename to buildroot/package/dawgdic/Config.in
diff --git a/software/package/dawgdic/dawgdic.hash b/buildroot/package/dawgdic/dawgdic.hash
similarity index 100%
rename from software/package/dawgdic/dawgdic.hash
rename to buildroot/package/dawgdic/dawgdic.hash
diff --git a/software/package/dawgdic/dawgdic.mk b/buildroot/package/dawgdic/dawgdic.mk
similarity index 100%
rename from software/package/dawgdic/dawgdic.mk
rename to buildroot/package/dawgdic/dawgdic.mk
diff --git a/software/package/dbus-cpp/0001-gcc4.7.patch b/buildroot/package/dbus-cpp/0001-gcc4.7.patch
similarity index 100%
rename from software/package/dbus-cpp/0001-gcc4.7.patch
rename to buildroot/package/dbus-cpp/0001-gcc4.7.patch
diff --git a/software/package/dbus-cpp/0002-cross-compile-tools.patch b/buildroot/package/dbus-cpp/0002-cross-compile-tools.patch
similarity index 100%
rename from software/package/dbus-cpp/0002-cross-compile-tools.patch
rename to buildroot/package/dbus-cpp/0002-cross-compile-tools.patch
diff --git a/software/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch b/buildroot/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch
similarity index 100%
rename from software/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch
rename to buildroot/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch
diff --git a/software/package/dbus-cpp/Config.in b/buildroot/package/dbus-cpp/Config.in
similarity index 100%
rename from software/package/dbus-cpp/Config.in
rename to buildroot/package/dbus-cpp/Config.in
diff --git a/software/package/dbus-cpp/dbus-cpp.hash b/buildroot/package/dbus-cpp/dbus-cpp.hash
similarity index 100%
rename from software/package/dbus-cpp/dbus-cpp.hash
rename to buildroot/package/dbus-cpp/dbus-cpp.hash
diff --git a/software/package/dbus-cpp/dbus-cpp.mk b/buildroot/package/dbus-cpp/dbus-cpp.mk
similarity index 100%
rename from software/package/dbus-cpp/dbus-cpp.mk
rename to buildroot/package/dbus-cpp/dbus-cpp.mk
diff --git a/software/package/dbus-glib/Config.in b/buildroot/package/dbus-glib/Config.in
similarity index 100%
rename from software/package/dbus-glib/Config.in
rename to buildroot/package/dbus-glib/Config.in
diff --git a/software/package/dbus-glib/dbus-glib.hash b/buildroot/package/dbus-glib/dbus-glib.hash
similarity index 100%
rename from software/package/dbus-glib/dbus-glib.hash
rename to buildroot/package/dbus-glib/dbus-glib.hash
diff --git a/software/package/dbus-glib/dbus-glib.mk b/buildroot/package/dbus-glib/dbus-glib.mk
similarity index 100%
rename from software/package/dbus-glib/dbus-glib.mk
rename to buildroot/package/dbus-glib/dbus-glib.mk
diff --git a/software/package/dbus-python/Config.in b/buildroot/package/dbus-python/Config.in
similarity index 100%
rename from software/package/dbus-python/Config.in
rename to buildroot/package/dbus-python/Config.in
diff --git a/software/package/dbus-python/Config.in.host b/buildroot/package/dbus-python/Config.in.host
similarity index 100%
rename from software/package/dbus-python/Config.in.host
rename to buildroot/package/dbus-python/Config.in.host
diff --git a/software/package/dbus-python/dbus-python.hash b/buildroot/package/dbus-python/dbus-python.hash
similarity index 100%
rename from software/package/dbus-python/dbus-python.hash
rename to buildroot/package/dbus-python/dbus-python.hash
diff --git a/software/package/dbus-python/dbus-python.mk b/buildroot/package/dbus-python/dbus-python.mk
similarity index 100%
rename from software/package/dbus-python/dbus-python.mk
rename to buildroot/package/dbus-python/dbus-python.mk
diff --git a/software/package/dbus-triggerd/Config.in b/buildroot/package/dbus-triggerd/Config.in
similarity index 100%
rename from software/package/dbus-triggerd/Config.in
rename to buildroot/package/dbus-triggerd/Config.in
diff --git a/software/package/dbus-triggerd/dbus-triggerd.hash b/buildroot/package/dbus-triggerd/dbus-triggerd.hash
similarity index 100%
rename from software/package/dbus-triggerd/dbus-triggerd.hash
rename to buildroot/package/dbus-triggerd/dbus-triggerd.hash
diff --git a/software/package/dbus-triggerd/dbus-triggerd.mk b/buildroot/package/dbus-triggerd/dbus-triggerd.mk
similarity index 100%
rename from software/package/dbus-triggerd/dbus-triggerd.mk
rename to buildroot/package/dbus-triggerd/dbus-triggerd.mk
diff --git a/software/package/dbus/Config.in b/buildroot/package/dbus/Config.in
similarity index 100%
rename from software/package/dbus/Config.in
rename to buildroot/package/dbus/Config.in
diff --git a/software/package/dbus/S30dbus b/buildroot/package/dbus/S30dbus
similarity index 100%
rename from software/package/dbus/S30dbus
rename to buildroot/package/dbus/S30dbus
diff --git a/software/package/dbus/dbus.hash b/buildroot/package/dbus/dbus.hash
similarity index 100%
rename from software/package/dbus/dbus.hash
rename to buildroot/package/dbus/dbus.hash
diff --git a/software/package/dbus/dbus.mk b/buildroot/package/dbus/dbus.mk
similarity index 100%
rename from software/package/dbus/dbus.mk
rename to buildroot/package/dbus/dbus.mk
diff --git a/software/package/dc3dd/0001-no_man.patch b/buildroot/package/dc3dd/0001-no_man.patch
similarity index 100%
rename from software/package/dc3dd/0001-no_man.patch
rename to buildroot/package/dc3dd/0001-no_man.patch
diff --git a/software/package/dc3dd/0002-fix-autoreconf.patch b/buildroot/package/dc3dd/0002-fix-autoreconf.patch
similarity index 100%
rename from software/package/dc3dd/0002-fix-autoreconf.patch
rename to buildroot/package/dc3dd/0002-fix-autoreconf.patch
diff --git a/software/package/dc3dd/0003-fix-for-glibc-2.28.patch b/buildroot/package/dc3dd/0003-fix-for-glibc-2.28.patch
similarity index 100%
rename from software/package/dc3dd/0003-fix-for-glibc-2.28.patch
rename to buildroot/package/dc3dd/0003-fix-for-glibc-2.28.patch
diff --git a/software/package/dc3dd/Config.in b/buildroot/package/dc3dd/Config.in
similarity index 100%
rename from software/package/dc3dd/Config.in
rename to buildroot/package/dc3dd/Config.in
diff --git a/software/package/dc3dd/dc3dd.hash b/buildroot/package/dc3dd/dc3dd.hash
similarity index 100%
rename from software/package/dc3dd/dc3dd.hash
rename to buildroot/package/dc3dd/dc3dd.hash
diff --git a/software/package/dc3dd/dc3dd.mk b/buildroot/package/dc3dd/dc3dd.mk
similarity index 100%
rename from software/package/dc3dd/dc3dd.mk
rename to buildroot/package/dc3dd/dc3dd.mk
diff --git a/software/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch b/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch
similarity index 100%
rename from software/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch
rename to buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch
diff --git a/software/package/dcron/Config.in b/buildroot/package/dcron/Config.in
similarity index 100%
rename from software/package/dcron/Config.in
rename to buildroot/package/dcron/Config.in
diff --git a/software/package/dcron/S90dcron b/buildroot/package/dcron/S90dcron
similarity index 100%
rename from software/package/dcron/S90dcron
rename to buildroot/package/dcron/S90dcron
diff --git a/software/package/dcron/dcron.hash b/buildroot/package/dcron/dcron.hash
similarity index 100%
rename from software/package/dcron/dcron.hash
rename to buildroot/package/dcron/dcron.hash
diff --git a/software/package/dcron/dcron.mk b/buildroot/package/dcron/dcron.mk
similarity index 100%
rename from software/package/dcron/dcron.mk
rename to buildroot/package/dcron/dcron.mk
diff --git a/software/package/dcron/dcron.service b/buildroot/package/dcron/dcron.service
similarity index 100%
rename from software/package/dcron/dcron.service
rename to buildroot/package/dcron/dcron.service
diff --git a/software/package/ddrescue/Config.in b/buildroot/package/ddrescue/Config.in
similarity index 100%
rename from software/package/ddrescue/Config.in
rename to buildroot/package/ddrescue/Config.in
diff --git a/software/package/ddrescue/ddrescue.hash b/buildroot/package/ddrescue/ddrescue.hash
similarity index 100%
rename from software/package/ddrescue/ddrescue.hash
rename to buildroot/package/ddrescue/ddrescue.hash
diff --git a/software/package/ddrescue/ddrescue.mk b/buildroot/package/ddrescue/ddrescue.mk
similarity index 100%
rename from software/package/ddrescue/ddrescue.mk
rename to buildroot/package/ddrescue/ddrescue.mk
diff --git a/software/package/debianutils/Config.in b/buildroot/package/debianutils/Config.in
similarity index 100%
rename from software/package/debianutils/Config.in
rename to buildroot/package/debianutils/Config.in
diff --git a/software/package/debianutils/debianutils.hash b/buildroot/package/debianutils/debianutils.hash
similarity index 100%
rename from software/package/debianutils/debianutils.hash
rename to buildroot/package/debianutils/debianutils.hash
diff --git a/software/package/debianutils/debianutils.mk b/buildroot/package/debianutils/debianutils.mk
similarity index 100%
rename from software/package/debianutils/debianutils.mk
rename to buildroot/package/debianutils/debianutils.mk
diff --git a/software/package/dehydrated/Config.in b/buildroot/package/dehydrated/Config.in
similarity index 100%
rename from software/package/dehydrated/Config.in
rename to buildroot/package/dehydrated/Config.in
diff --git a/software/package/dehydrated/dehydrated.hash b/buildroot/package/dehydrated/dehydrated.hash
similarity index 100%
rename from software/package/dehydrated/dehydrated.hash
rename to buildroot/package/dehydrated/dehydrated.hash
diff --git a/software/package/dehydrated/dehydrated.mk b/buildroot/package/dehydrated/dehydrated.mk
similarity index 100%
rename from software/package/dehydrated/dehydrated.mk
rename to buildroot/package/dehydrated/dehydrated.mk
diff --git a/software/package/dejavu/Config.in b/buildroot/package/dejavu/Config.in
similarity index 100%
rename from software/package/dejavu/Config.in
rename to buildroot/package/dejavu/Config.in
diff --git a/software/package/dejavu/dejavu.hash b/buildroot/package/dejavu/dejavu.hash
similarity index 100%
rename from software/package/dejavu/dejavu.hash
rename to buildroot/package/dejavu/dejavu.hash
diff --git a/software/package/dejavu/dejavu.mk b/buildroot/package/dejavu/dejavu.mk
similarity index 100%
rename from software/package/dejavu/dejavu.mk
rename to buildroot/package/dejavu/dejavu.mk
diff --git a/software/package/dfu-util/Config.in b/buildroot/package/dfu-util/Config.in
similarity index 100%
rename from software/package/dfu-util/Config.in
rename to buildroot/package/dfu-util/Config.in
diff --git a/software/package/dfu-util/Config.in.host b/buildroot/package/dfu-util/Config.in.host
similarity index 100%
rename from software/package/dfu-util/Config.in.host
rename to buildroot/package/dfu-util/Config.in.host
diff --git a/software/package/dfu-util/dfu-util.hash b/buildroot/package/dfu-util/dfu-util.hash
similarity index 100%
rename from software/package/dfu-util/dfu-util.hash
rename to buildroot/package/dfu-util/dfu-util.hash
diff --git a/software/package/dfu-util/dfu-util.mk b/buildroot/package/dfu-util/dfu-util.mk
similarity index 100%
rename from software/package/dfu-util/dfu-util.mk
rename to buildroot/package/dfu-util/dfu-util.mk
diff --git a/software/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch b/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch
similarity index 100%
rename from software/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch
rename to buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch
diff --git a/software/package/dhcp/Config.in b/buildroot/package/dhcp/Config.in
similarity index 100%
rename from software/package/dhcp/Config.in
rename to buildroot/package/dhcp/Config.in
diff --git a/software/package/dhcp/S80dhcp-relay b/buildroot/package/dhcp/S80dhcp-relay
similarity index 100%
rename from software/package/dhcp/S80dhcp-relay
rename to buildroot/package/dhcp/S80dhcp-relay
diff --git a/software/package/dhcp/S80dhcp-server b/buildroot/package/dhcp/S80dhcp-server
similarity index 100%
rename from software/package/dhcp/S80dhcp-server
rename to buildroot/package/dhcp/S80dhcp-server
diff --git a/software/package/dhcp/dhclient-script b/buildroot/package/dhcp/dhclient-script
similarity index 100%
rename from software/package/dhcp/dhclient-script
rename to buildroot/package/dhcp/dhclient-script
diff --git a/software/package/dhcp/dhclient.conf b/buildroot/package/dhcp/dhclient.conf
similarity index 100%
rename from software/package/dhcp/dhclient.conf
rename to buildroot/package/dhcp/dhclient.conf
diff --git a/software/package/dhcp/dhcp.hash b/buildroot/package/dhcp/dhcp.hash
similarity index 100%
rename from software/package/dhcp/dhcp.hash
rename to buildroot/package/dhcp/dhcp.hash
diff --git a/software/package/dhcp/dhcp.mk b/buildroot/package/dhcp/dhcp.mk
similarity index 100%
rename from software/package/dhcp/dhcp.mk
rename to buildroot/package/dhcp/dhcp.mk
diff --git a/software/package/dhcp/dhcpd.conf b/buildroot/package/dhcp/dhcpd.conf
similarity index 100%
rename from software/package/dhcp/dhcpd.conf
rename to buildroot/package/dhcp/dhcpd.conf
diff --git a/software/package/dhcp/dhcpd.service b/buildroot/package/dhcp/dhcpd.service
similarity index 100%
rename from software/package/dhcp/dhcpd.service
rename to buildroot/package/dhcp/dhcpd.service
diff --git a/software/package/dhcpcd/Config.in b/buildroot/package/dhcpcd/Config.in
similarity index 100%
rename from software/package/dhcpcd/Config.in
rename to buildroot/package/dhcpcd/Config.in
diff --git a/software/package/dhcpcd/S41dhcpcd b/buildroot/package/dhcpcd/S41dhcpcd
similarity index 100%
rename from software/package/dhcpcd/S41dhcpcd
rename to buildroot/package/dhcpcd/S41dhcpcd
diff --git a/software/package/dhcpcd/dhcpcd.hash b/buildroot/package/dhcpcd/dhcpcd.hash
similarity index 100%
rename from software/package/dhcpcd/dhcpcd.hash
rename to buildroot/package/dhcpcd/dhcpcd.hash
diff --git a/software/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk
similarity index 100%
rename from software/package/dhcpcd/dhcpcd.mk
rename to buildroot/package/dhcpcd/dhcpcd.mk
diff --git a/software/package/dhcpcd/dhcpcd.service b/buildroot/package/dhcpcd/dhcpcd.service
similarity index 100%
rename from software/package/dhcpcd/dhcpcd.service
rename to buildroot/package/dhcpcd/dhcpcd.service
diff --git a/software/package/dhcpdump/0001-use-non-bsd-structures.patch b/buildroot/package/dhcpdump/0001-use-non-bsd-structures.patch
similarity index 100%
rename from software/package/dhcpdump/0001-use-non-bsd-structures.patch
rename to buildroot/package/dhcpdump/0001-use-non-bsd-structures.patch
diff --git a/software/package/dhcpdump/Config.in b/buildroot/package/dhcpdump/Config.in
similarity index 100%
rename from software/package/dhcpdump/Config.in
rename to buildroot/package/dhcpdump/Config.in
diff --git a/software/package/dhcpdump/dhcpdump.hash b/buildroot/package/dhcpdump/dhcpdump.hash
similarity index 100%
rename from software/package/dhcpdump/dhcpdump.hash
rename to buildroot/package/dhcpdump/dhcpdump.hash
diff --git a/software/package/dhcpdump/dhcpdump.mk b/buildroot/package/dhcpdump/dhcpdump.mk
similarity index 100%
rename from software/package/dhcpdump/dhcpdump.mk
rename to buildroot/package/dhcpdump/dhcpdump.mk
diff --git a/software/package/dhrystone/0001-cmdline-nruns.patch b/buildroot/package/dhrystone/0001-cmdline-nruns.patch
similarity index 100%
rename from software/package/dhrystone/0001-cmdline-nruns.patch
rename to buildroot/package/dhrystone/0001-cmdline-nruns.patch
diff --git a/software/package/dhrystone/0002-HZ.patch b/buildroot/package/dhrystone/0002-HZ.patch
similarity index 100%
rename from software/package/dhrystone/0002-HZ.patch
rename to buildroot/package/dhrystone/0002-HZ.patch
diff --git a/software/package/dhrystone/0003-exit.patch b/buildroot/package/dhrystone/0003-exit.patch
similarity index 100%
rename from software/package/dhrystone/0003-exit.patch
rename to buildroot/package/dhrystone/0003-exit.patch
diff --git a/software/package/dhrystone/0004-headers.patch b/buildroot/package/dhrystone/0004-headers.patch
similarity index 100%
rename from software/package/dhrystone/0004-headers.patch
rename to buildroot/package/dhrystone/0004-headers.patch
diff --git a/software/package/dhrystone/0005-prototypes.patch b/buildroot/package/dhrystone/0005-prototypes.patch
similarity index 100%
rename from software/package/dhrystone/0005-prototypes.patch
rename to buildroot/package/dhrystone/0005-prototypes.patch
diff --git a/software/package/dhrystone/Config.in b/buildroot/package/dhrystone/Config.in
similarity index 100%
rename from software/package/dhrystone/Config.in
rename to buildroot/package/dhrystone/Config.in
diff --git a/software/package/dhrystone/Makefile b/buildroot/package/dhrystone/Makefile
similarity index 100%
rename from software/package/dhrystone/Makefile
rename to buildroot/package/dhrystone/Makefile
diff --git a/software/package/dhrystone/dhrystone.hash b/buildroot/package/dhrystone/dhrystone.hash
similarity index 100%
rename from software/package/dhrystone/dhrystone.hash
rename to buildroot/package/dhrystone/dhrystone.hash
diff --git a/software/package/dhrystone/dhrystone.mk b/buildroot/package/dhrystone/dhrystone.mk
similarity index 100%
rename from software/package/dhrystone/dhrystone.mk
rename to buildroot/package/dhrystone/dhrystone.mk
diff --git a/software/package/dialog/Config.in b/buildroot/package/dialog/Config.in
similarity index 100%
rename from software/package/dialog/Config.in
rename to buildroot/package/dialog/Config.in
diff --git a/software/package/dialog/dialog.hash b/buildroot/package/dialog/dialog.hash
similarity index 100%
rename from software/package/dialog/dialog.hash
rename to buildroot/package/dialog/dialog.hash
diff --git a/software/package/dialog/dialog.mk b/buildroot/package/dialog/dialog.mk
similarity index 100%
rename from software/package/dialog/dialog.mk
rename to buildroot/package/dialog/dialog.mk
diff --git a/software/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch b/buildroot/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch
similarity index 100%
rename from software/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch
rename to buildroot/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch
diff --git a/software/package/dieharder/0002-Fix-missing-type-intptr_t.patch b/buildroot/package/dieharder/0002-Fix-missing-type-intptr_t.patch
similarity index 100%
rename from software/package/dieharder/0002-Fix-missing-type-intptr_t.patch
rename to buildroot/package/dieharder/0002-Fix-missing-type-intptr_t.patch
diff --git a/software/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch b/buildroot/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch
similarity index 100%
rename from software/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch
rename to buildroot/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch
diff --git a/software/package/dieharder/0004-Add-static-to-inline-functions.patch b/buildroot/package/dieharder/0004-Add-static-to-inline-functions.patch
similarity index 100%
rename from software/package/dieharder/0004-Add-static-to-inline-functions.patch
rename to buildroot/package/dieharder/0004-Add-static-to-inline-functions.patch
diff --git a/software/package/dieharder/Config.in b/buildroot/package/dieharder/Config.in
similarity index 100%
rename from software/package/dieharder/Config.in
rename to buildroot/package/dieharder/Config.in
diff --git a/software/package/dieharder/dieharder.hash b/buildroot/package/dieharder/dieharder.hash
similarity index 100%
rename from software/package/dieharder/dieharder.hash
rename to buildroot/package/dieharder/dieharder.hash
diff --git a/software/package/dieharder/dieharder.mk b/buildroot/package/dieharder/dieharder.mk
similarity index 100%
rename from software/package/dieharder/dieharder.mk
rename to buildroot/package/dieharder/dieharder.mk
diff --git a/software/package/diffutils/Config.in b/buildroot/package/diffutils/Config.in
similarity index 100%
rename from software/package/diffutils/Config.in
rename to buildroot/package/diffutils/Config.in
diff --git a/software/package/diffutils/diffutils.hash b/buildroot/package/diffutils/diffutils.hash
similarity index 100%
rename from software/package/diffutils/diffutils.hash
rename to buildroot/package/diffutils/diffutils.hash
diff --git a/software/package/diffutils/diffutils.mk b/buildroot/package/diffutils/diffutils.mk
similarity index 100%
rename from software/package/diffutils/diffutils.mk
rename to buildroot/package/diffutils/diffutils.mk
diff --git a/software/package/dillo/0002-usr-local-include.patch b/buildroot/package/dillo/0002-usr-local-include.patch
similarity index 100%
rename from software/package/dillo/0002-usr-local-include.patch
rename to buildroot/package/dillo/0002-usr-local-include.patch
diff --git a/software/package/dillo/0003-Fix-openssl-detection.patch b/buildroot/package/dillo/0003-Fix-openssl-detection.patch
similarity index 100%
rename from software/package/dillo/0003-Fix-openssl-detection.patch
rename to buildroot/package/dillo/0003-Fix-openssl-detection.patch
diff --git a/software/package/dillo/0004-Support-OpenSSL-1.1.0.patch b/buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch
similarity index 100%
rename from software/package/dillo/0004-Support-OpenSSL-1.1.0.patch
rename to buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch
diff --git a/software/package/dillo/Config.in b/buildroot/package/dillo/Config.in
similarity index 100%
rename from software/package/dillo/Config.in
rename to buildroot/package/dillo/Config.in
diff --git a/software/package/dillo/dillo.hash b/buildroot/package/dillo/dillo.hash
similarity index 100%
rename from software/package/dillo/dillo.hash
rename to buildroot/package/dillo/dillo.hash
diff --git a/software/package/dillo/dillo.mk b/buildroot/package/dillo/dillo.mk
similarity index 100%
rename from software/package/dillo/dillo.mk
rename to buildroot/package/dillo/dillo.mk
diff --git a/software/package/ding-libs/Config.in b/buildroot/package/ding-libs/Config.in
similarity index 100%
rename from software/package/ding-libs/Config.in
rename to buildroot/package/ding-libs/Config.in
diff --git a/software/package/ding-libs/ding-libs.hash b/buildroot/package/ding-libs/ding-libs.hash
similarity index 100%
rename from software/package/ding-libs/ding-libs.hash
rename to buildroot/package/ding-libs/ding-libs.hash
diff --git a/software/package/ding-libs/ding-libs.mk b/buildroot/package/ding-libs/ding-libs.mk
similarity index 100%
rename from software/package/ding-libs/ding-libs.mk
rename to buildroot/package/ding-libs/ding-libs.mk
diff --git a/software/package/directfb-examples/0001-remove-bzero.patch b/buildroot/package/directfb-examples/0001-remove-bzero.patch
similarity index 100%
rename from software/package/directfb-examples/0001-remove-bzero.patch
rename to buildroot/package/directfb-examples/0001-remove-bzero.patch
diff --git a/software/package/directfb-examples/Config.in b/buildroot/package/directfb-examples/Config.in
similarity index 100%
rename from software/package/directfb-examples/Config.in
rename to buildroot/package/directfb-examples/Config.in
diff --git a/software/package/directfb-examples/directfb-examples.hash b/buildroot/package/directfb-examples/directfb-examples.hash
similarity index 100%
rename from software/package/directfb-examples/directfb-examples.hash
rename to buildroot/package/directfb-examples/directfb-examples.hash
diff --git a/software/package/directfb-examples/directfb-examples.mk b/buildroot/package/directfb-examples/directfb-examples.mk
similarity index 100%
rename from software/package/directfb-examples/directfb-examples.mk
rename to buildroot/package/directfb-examples/directfb-examples.mk
diff --git a/software/package/directfb/0001-fix-missing-davinci-voodoo-header.patch b/buildroot/package/directfb/0001-fix-missing-davinci-voodoo-header.patch
similarity index 100%
rename from software/package/directfb/0001-fix-missing-davinci-voodoo-header.patch
rename to buildroot/package/directfb/0001-fix-missing-davinci-voodoo-header.patch
diff --git a/software/package/directfb/0002-imlib2-config.patch b/buildroot/package/directfb/0002-imlib2-config.patch
similarity index 100%
rename from software/package/directfb/0002-imlib2-config.patch
rename to buildroot/package/directfb/0002-imlib2-config.patch
diff --git a/software/package/directfb/0003-setregion-lock.patch b/buildroot/package/directfb/0003-setregion-lock.patch
similarity index 100%
rename from software/package/directfb/0003-setregion-lock.patch
rename to buildroot/package/directfb/0003-setregion-lock.patch
diff --git a/software/package/directfb/0004-use-gcc-link.patch b/buildroot/package/directfb/0004-use-gcc-link.patch
similarity index 100%
rename from software/package/directfb/0004-use-gcc-link.patch
rename to buildroot/package/directfb/0004-use-gcc-link.patch
diff --git a/software/package/directfb/0005-add-missing-idivine-header.patch b/buildroot/package/directfb/0005-add-missing-idivine-header.patch
similarity index 100%
rename from software/package/directfb/0005-add-missing-idivine-header.patch
rename to buildroot/package/directfb/0005-add-missing-idivine-header.patch
diff --git a/software/package/directfb/0006-fix-client-gfx_state-initialisation.patch b/buildroot/package/directfb/0006-fix-client-gfx_state-initialisation.patch
similarity index 100%
rename from software/package/directfb/0006-fix-client-gfx_state-initialisation.patch
rename to buildroot/package/directfb/0006-fix-client-gfx_state-initialisation.patch
diff --git a/software/package/directfb/Config.in b/buildroot/package/directfb/Config.in
similarity index 100%
rename from software/package/directfb/Config.in
rename to buildroot/package/directfb/Config.in
diff --git a/software/package/directfb/directfb.hash b/buildroot/package/directfb/directfb.hash
similarity index 100%
rename from software/package/directfb/directfb.hash
rename to buildroot/package/directfb/directfb.hash
diff --git a/software/package/directfb/directfb.mk b/buildroot/package/directfb/directfb.mk
similarity index 100%
rename from software/package/directfb/directfb.mk
rename to buildroot/package/directfb/directfb.mk
diff --git a/software/package/dmalloc/0001-add-fpic.patch b/buildroot/package/dmalloc/0001-add-fpic.patch
similarity index 100%
rename from software/package/dmalloc/0001-add-fpic.patch
rename to buildroot/package/dmalloc/0001-add-fpic.patch
diff --git a/software/package/dmalloc/0002-mips.patch b/buildroot/package/dmalloc/0002-mips.patch
similarity index 100%
rename from software/package/dmalloc/0002-mips.patch
rename to buildroot/package/dmalloc/0002-mips.patch
diff --git a/software/package/dmalloc/0003-fix-parallel-build.patch b/buildroot/package/dmalloc/0003-fix-parallel-build.patch
similarity index 100%
rename from software/package/dmalloc/0003-fix-parallel-build.patch
rename to buildroot/package/dmalloc/0003-fix-parallel-build.patch
diff --git a/software/package/dmalloc/0004-fix-shlibs.patch b/buildroot/package/dmalloc/0004-fix-shlibs.patch
similarity index 100%
rename from software/package/dmalloc/0004-fix-shlibs.patch
rename to buildroot/package/dmalloc/0004-fix-shlibs.patch
diff --git a/software/package/dmalloc/0005-fix-strdup.patch b/buildroot/package/dmalloc/0005-fix-strdup.patch
similarity index 100%
rename from software/package/dmalloc/0005-fix-strdup.patch
rename to buildroot/package/dmalloc/0005-fix-strdup.patch
diff --git a/software/package/dmalloc/0006-fix-strndup.patch b/buildroot/package/dmalloc/0006-fix-strndup.patch
similarity index 100%
rename from software/package/dmalloc/0006-fix-strndup.patch
rename to buildroot/package/dmalloc/0006-fix-strndup.patch
diff --git a/software/package/dmalloc/Config.in b/buildroot/package/dmalloc/Config.in
similarity index 100%
rename from software/package/dmalloc/Config.in
rename to buildroot/package/dmalloc/Config.in
diff --git a/software/package/dmalloc/dmalloc.hash b/buildroot/package/dmalloc/dmalloc.hash
similarity index 100%
rename from software/package/dmalloc/dmalloc.hash
rename to buildroot/package/dmalloc/dmalloc.hash
diff --git a/software/package/dmalloc/dmalloc.mk b/buildroot/package/dmalloc/dmalloc.mk
similarity index 100%
rename from software/package/dmalloc/dmalloc.mk
rename to buildroot/package/dmalloc/dmalloc.mk
diff --git a/software/package/dmidecode/0001-build-system-fixes.patch b/buildroot/package/dmidecode/0001-build-system-fixes.patch
similarity index 100%
rename from software/package/dmidecode/0001-build-system-fixes.patch
rename to buildroot/package/dmidecode/0001-build-system-fixes.patch
diff --git a/software/package/dmidecode/Config.in b/buildroot/package/dmidecode/Config.in
similarity index 100%
rename from software/package/dmidecode/Config.in
rename to buildroot/package/dmidecode/Config.in
diff --git a/software/package/dmidecode/dmidecode.hash b/buildroot/package/dmidecode/dmidecode.hash
similarity index 100%
rename from software/package/dmidecode/dmidecode.hash
rename to buildroot/package/dmidecode/dmidecode.hash
diff --git a/software/package/dmidecode/dmidecode.mk b/buildroot/package/dmidecode/dmidecode.mk
similarity index 100%
rename from software/package/dmidecode/dmidecode.mk
rename to buildroot/package/dmidecode/dmidecode.mk
diff --git a/software/package/dmraid/0001-fix-compilation-under-musl.patch b/buildroot/package/dmraid/0001-fix-compilation-under-musl.patch
similarity index 100%
rename from software/package/dmraid/0001-fix-compilation-under-musl.patch
rename to buildroot/package/dmraid/0001-fix-compilation-under-musl.patch
diff --git a/software/package/dmraid/Config.in b/buildroot/package/dmraid/Config.in
similarity index 100%
rename from software/package/dmraid/Config.in
rename to buildroot/package/dmraid/Config.in
diff --git a/software/package/dmraid/S20dmraid b/buildroot/package/dmraid/S20dmraid
similarity index 100%
rename from software/package/dmraid/S20dmraid
rename to buildroot/package/dmraid/S20dmraid
diff --git a/software/package/dmraid/dmraid.hash b/buildroot/package/dmraid/dmraid.hash
similarity index 100%
rename from software/package/dmraid/dmraid.hash
rename to buildroot/package/dmraid/dmraid.hash
diff --git a/software/package/dmraid/dmraid.mk b/buildroot/package/dmraid/dmraid.mk
similarity index 100%
rename from software/package/dmraid/dmraid.mk
rename to buildroot/package/dmraid/dmraid.mk
diff --git a/software/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch b/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch
similarity index 100%
rename from software/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch
rename to buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch
diff --git a/software/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch b/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch
similarity index 100%
rename from software/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch
rename to buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch
diff --git a/software/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch b/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch
similarity index 100%
rename from software/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch
rename to buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch
diff --git a/software/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch b/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch
similarity index 100%
rename from software/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch
rename to buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch
diff --git a/software/package/dnsmasq/Config.in b/buildroot/package/dnsmasq/Config.in
similarity index 100%
rename from software/package/dnsmasq/Config.in
rename to buildroot/package/dnsmasq/Config.in
diff --git a/software/package/dnsmasq/S80dnsmasq b/buildroot/package/dnsmasq/S80dnsmasq
similarity index 100%
rename from software/package/dnsmasq/S80dnsmasq
rename to buildroot/package/dnsmasq/S80dnsmasq
diff --git a/software/package/dnsmasq/dnsmasq.hash b/buildroot/package/dnsmasq/dnsmasq.hash
similarity index 100%
rename from software/package/dnsmasq/dnsmasq.hash
rename to buildroot/package/dnsmasq/dnsmasq.hash
diff --git a/software/package/dnsmasq/dnsmasq.mk b/buildroot/package/dnsmasq/dnsmasq.mk
similarity index 100%
rename from software/package/dnsmasq/dnsmasq.mk
rename to buildroot/package/dnsmasq/dnsmasq.mk
diff --git a/software/package/doc-asciidoc.mk b/buildroot/package/doc-asciidoc.mk
similarity index 100%
rename from software/package/doc-asciidoc.mk
rename to buildroot/package/doc-asciidoc.mk
diff --git a/software/package/docker-cli/Config.in b/buildroot/package/docker-cli/Config.in
similarity index 100%
rename from software/package/docker-cli/Config.in
rename to buildroot/package/docker-cli/Config.in
diff --git a/software/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash
similarity index 100%
rename from software/package/docker-cli/docker-cli.hash
rename to buildroot/package/docker-cli/docker-cli.hash
diff --git a/software/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk
similarity index 100%
rename from software/package/docker-cli/docker-cli.mk
rename to buildroot/package/docker-cli/docker-cli.mk
diff --git a/software/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch b/buildroot/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
similarity index 100%
rename from software/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
rename to buildroot/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
diff --git a/software/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch b/buildroot/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
similarity index 100%
rename from software/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
rename to buildroot/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
diff --git a/software/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/buildroot/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
similarity index 100%
rename from software/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
rename to buildroot/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
diff --git a/software/package/docker-compose/Config.in b/buildroot/package/docker-compose/Config.in
similarity index 100%
rename from software/package/docker-compose/Config.in
rename to buildroot/package/docker-compose/Config.in
diff --git a/software/package/docker-compose/docker-compose.hash b/buildroot/package/docker-compose/docker-compose.hash
similarity index 100%
rename from software/package/docker-compose/docker-compose.hash
rename to buildroot/package/docker-compose/docker-compose.hash
diff --git a/software/package/docker-compose/docker-compose.mk b/buildroot/package/docker-compose/docker-compose.mk
similarity index 100%
rename from software/package/docker-compose/docker-compose.mk
rename to buildroot/package/docker-compose/docker-compose.mk
diff --git a/software/package/docker-containerd/Config.in b/buildroot/package/docker-containerd/Config.in
similarity index 100%
rename from software/package/docker-containerd/Config.in
rename to buildroot/package/docker-containerd/Config.in
diff --git a/software/package/docker-containerd/docker-containerd.hash b/buildroot/package/docker-containerd/docker-containerd.hash
similarity index 100%
rename from software/package/docker-containerd/docker-containerd.hash
rename to buildroot/package/docker-containerd/docker-containerd.hash
diff --git a/software/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk
similarity index 100%
rename from software/package/docker-containerd/docker-containerd.mk
rename to buildroot/package/docker-containerd/docker-containerd.mk
diff --git a/software/package/docker-engine/Config.in b/buildroot/package/docker-engine/Config.in
similarity index 100%
rename from software/package/docker-engine/Config.in
rename to buildroot/package/docker-engine/Config.in
diff --git a/software/package/docker-engine/S60dockerd b/buildroot/package/docker-engine/S60dockerd
similarity index 100%
rename from software/package/docker-engine/S60dockerd
rename to buildroot/package/docker-engine/S60dockerd
diff --git a/software/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash
similarity index 100%
rename from software/package/docker-engine/docker-engine.hash
rename to buildroot/package/docker-engine/docker-engine.hash
diff --git a/software/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk
similarity index 100%
rename from software/package/docker-engine/docker-engine.mk
rename to buildroot/package/docker-engine/docker-engine.mk
diff --git a/software/package/docker-proxy/Config.in b/buildroot/package/docker-proxy/Config.in
similarity index 100%
rename from software/package/docker-proxy/Config.in
rename to buildroot/package/docker-proxy/Config.in
diff --git a/software/package/docker-proxy/docker-proxy.hash b/buildroot/package/docker-proxy/docker-proxy.hash
similarity index 100%
rename from software/package/docker-proxy/docker-proxy.hash
rename to buildroot/package/docker-proxy/docker-proxy.hash
diff --git a/software/package/docker-proxy/docker-proxy.mk b/buildroot/package/docker-proxy/docker-proxy.mk
similarity index 100%
rename from software/package/docker-proxy/docker-proxy.mk
rename to buildroot/package/docker-proxy/docker-proxy.mk
diff --git a/software/package/docker/Config.in b/buildroot/package/docker/Config.in
similarity index 100%
rename from software/package/docker/Config.in
rename to buildroot/package/docker/Config.in
diff --git a/software/package/docker/docker.hash b/buildroot/package/docker/docker.hash
similarity index 100%
rename from software/package/docker/docker.hash
rename to buildroot/package/docker/docker.hash
diff --git a/software/package/docker/docker.mk b/buildroot/package/docker/docker.mk
similarity index 100%
rename from software/package/docker/docker.mk
rename to buildroot/package/docker/docker.mk
diff --git a/software/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch b/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch
similarity index 100%
rename from software/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch
rename to buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch
diff --git a/software/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch b/buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch
similarity index 100%
rename from software/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch
rename to buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch
diff --git a/software/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch b/buildroot/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch
similarity index 100%
rename from software/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch
rename to buildroot/package/domoticz/0003-CMakeLists.txt-add-c-argument-to-build-precompiled-h.patch
diff --git a/software/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch b/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch
similarity index 100%
rename from software/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch
rename to buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch
diff --git a/software/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch b/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch
similarity index 100%
rename from software/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch
rename to buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch
diff --git a/software/package/domoticz/Config.in b/buildroot/package/domoticz/Config.in
similarity index 100%
rename from software/package/domoticz/Config.in
rename to buildroot/package/domoticz/Config.in
diff --git a/software/package/domoticz/S99domoticz b/buildroot/package/domoticz/S99domoticz
similarity index 100%
rename from software/package/domoticz/S99domoticz
rename to buildroot/package/domoticz/S99domoticz
diff --git a/software/package/domoticz/domoticz.hash b/buildroot/package/domoticz/domoticz.hash
similarity index 100%
rename from software/package/domoticz/domoticz.hash
rename to buildroot/package/domoticz/domoticz.hash
diff --git a/software/package/domoticz/domoticz.mk b/buildroot/package/domoticz/domoticz.mk
similarity index 100%
rename from software/package/domoticz/domoticz.mk
rename to buildroot/package/domoticz/domoticz.mk
diff --git a/software/package/domoticz/domoticz.service b/buildroot/package/domoticz/domoticz.service
similarity index 100%
rename from software/package/domoticz/domoticz.service
rename to buildroot/package/domoticz/domoticz.service
diff --git a/software/package/doom-wad/Config.in b/buildroot/package/doom-wad/Config.in
similarity index 100%
rename from software/package/doom-wad/Config.in
rename to buildroot/package/doom-wad/Config.in
diff --git a/software/package/doom-wad/doom-wad.hash b/buildroot/package/doom-wad/doom-wad.hash
similarity index 100%
rename from software/package/doom-wad/doom-wad.hash
rename to buildroot/package/doom-wad/doom-wad.hash
diff --git a/software/package/doom-wad/doom-wad.mk b/buildroot/package/doom-wad/doom-wad.mk
similarity index 100%
rename from software/package/doom-wad/doom-wad.mk
rename to buildroot/package/doom-wad/doom-wad.mk
diff --git a/software/package/dos2unix/Config.in b/buildroot/package/dos2unix/Config.in
similarity index 100%
rename from software/package/dos2unix/Config.in
rename to buildroot/package/dos2unix/Config.in
diff --git a/software/package/dos2unix/Config.in.host b/buildroot/package/dos2unix/Config.in.host
similarity index 100%
rename from software/package/dos2unix/Config.in.host
rename to buildroot/package/dos2unix/Config.in.host
diff --git a/software/package/dos2unix/dos2unix.hash b/buildroot/package/dos2unix/dos2unix.hash
similarity index 100%
rename from software/package/dos2unix/dos2unix.hash
rename to buildroot/package/dos2unix/dos2unix.hash
diff --git a/software/package/dos2unix/dos2unix.mk b/buildroot/package/dos2unix/dos2unix.mk
similarity index 100%
rename from software/package/dos2unix/dos2unix.mk
rename to buildroot/package/dos2unix/dos2unix.mk
diff --git a/software/package/dosfstools/Config.in b/buildroot/package/dosfstools/Config.in
similarity index 100%
rename from software/package/dosfstools/Config.in
rename to buildroot/package/dosfstools/Config.in
diff --git a/software/package/dosfstools/Config.in.host b/buildroot/package/dosfstools/Config.in.host
similarity index 100%
rename from software/package/dosfstools/Config.in.host
rename to buildroot/package/dosfstools/Config.in.host
diff --git a/software/package/dosfstools/dosfstools.hash b/buildroot/package/dosfstools/dosfstools.hash
similarity index 100%
rename from software/package/dosfstools/dosfstools.hash
rename to buildroot/package/dosfstools/dosfstools.hash
diff --git a/software/package/dosfstools/dosfstools.mk b/buildroot/package/dosfstools/dosfstools.mk
similarity index 100%
rename from software/package/dosfstools/dosfstools.mk
rename to buildroot/package/dosfstools/dosfstools.mk
diff --git a/software/package/dovecot-pigeonhole/Config.in b/buildroot/package/dovecot-pigeonhole/Config.in
similarity index 100%
rename from software/package/dovecot-pigeonhole/Config.in
rename to buildroot/package/dovecot-pigeonhole/Config.in
diff --git a/software/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
similarity index 100%
rename from software/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
rename to buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
diff --git a/software/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
similarity index 100%
rename from software/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
rename to buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
diff --git a/software/package/dovecot/Config.in b/buildroot/package/dovecot/Config.in
similarity index 100%
rename from software/package/dovecot/Config.in
rename to buildroot/package/dovecot/Config.in
diff --git a/software/package/dovecot/dovecot.hash b/buildroot/package/dovecot/dovecot.hash
similarity index 100%
rename from software/package/dovecot/dovecot.hash
rename to buildroot/package/dovecot/dovecot.hash
diff --git a/software/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk
similarity index 100%
rename from software/package/dovecot/dovecot.mk
rename to buildroot/package/dovecot/dovecot.mk
diff --git a/software/package/doxygen/Config.in.host b/buildroot/package/doxygen/Config.in.host
similarity index 100%
rename from software/package/doxygen/Config.in.host
rename to buildroot/package/doxygen/Config.in.host
diff --git a/software/package/doxygen/doxygen.hash b/buildroot/package/doxygen/doxygen.hash
similarity index 100%
rename from software/package/doxygen/doxygen.hash
rename to buildroot/package/doxygen/doxygen.hash
diff --git a/software/package/doxygen/doxygen.mk b/buildroot/package/doxygen/doxygen.mk
similarity index 100%
rename from software/package/doxygen/doxygen.mk
rename to buildroot/package/doxygen/doxygen.mk
diff --git a/software/package/drbd-utils/Config.in b/buildroot/package/drbd-utils/Config.in
similarity index 100%
rename from software/package/drbd-utils/Config.in
rename to buildroot/package/drbd-utils/Config.in
diff --git a/software/package/drbd-utils/drbd-utils.hash b/buildroot/package/drbd-utils/drbd-utils.hash
similarity index 100%
rename from software/package/drbd-utils/drbd-utils.hash
rename to buildroot/package/drbd-utils/drbd-utils.hash
diff --git a/software/package/drbd-utils/drbd-utils.mk b/buildroot/package/drbd-utils/drbd-utils.mk
similarity index 100%
rename from software/package/drbd-utils/drbd-utils.mk
rename to buildroot/package/drbd-utils/drbd-utils.mk
diff --git a/software/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch b/buildroot/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch
similarity index 100%
rename from software/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch
rename to buildroot/package/dropbear/0001-scp-Port-OpenSSH-CVE-2018-20685-fix.patch
diff --git a/software/package/dropbear/Config.in b/buildroot/package/dropbear/Config.in
similarity index 100%
rename from software/package/dropbear/Config.in
rename to buildroot/package/dropbear/Config.in
diff --git a/software/package/dropbear/S50dropbear b/buildroot/package/dropbear/S50dropbear
similarity index 100%
rename from software/package/dropbear/S50dropbear
rename to buildroot/package/dropbear/S50dropbear
diff --git a/software/package/dropbear/dropbear.hash b/buildroot/package/dropbear/dropbear.hash
similarity index 100%
rename from software/package/dropbear/dropbear.hash
rename to buildroot/package/dropbear/dropbear.hash
diff --git a/software/package/dropbear/dropbear.mk b/buildroot/package/dropbear/dropbear.mk
similarity index 100%
rename from software/package/dropbear/dropbear.mk
rename to buildroot/package/dropbear/dropbear.mk
diff --git a/software/package/dropbear/dropbear.service b/buildroot/package/dropbear/dropbear.service
similarity index 100%
rename from software/package/dropbear/dropbear.service
rename to buildroot/package/dropbear/dropbear.service
diff --git a/software/package/dropbear/etc-pam.d-sshd b/buildroot/package/dropbear/etc-pam.d-sshd
similarity index 100%
rename from software/package/dropbear/etc-pam.d-sshd
rename to buildroot/package/dropbear/etc-pam.d-sshd
diff --git a/software/package/dropwatch/0001-binutils-2.23.1.patch b/buildroot/package/dropwatch/0001-binutils-2.23.1.patch
similarity index 100%
rename from software/package/dropwatch/0001-binutils-2.23.1.patch
rename to buildroot/package/dropwatch/0001-binutils-2.23.1.patch
diff --git a/software/package/dropwatch/0002-Make-binutils-optional.patch b/buildroot/package/dropwatch/0002-Make-binutils-optional.patch
similarity index 100%
rename from software/package/dropwatch/0002-Make-binutils-optional.patch
rename to buildroot/package/dropwatch/0002-Make-binutils-optional.patch
diff --git a/software/package/dropwatch/Config.in b/buildroot/package/dropwatch/Config.in
similarity index 100%
rename from software/package/dropwatch/Config.in
rename to buildroot/package/dropwatch/Config.in
diff --git a/software/package/dropwatch/dropwatch.hash b/buildroot/package/dropwatch/dropwatch.hash
similarity index 100%
rename from software/package/dropwatch/dropwatch.hash
rename to buildroot/package/dropwatch/dropwatch.hash
diff --git a/software/package/dropwatch/dropwatch.mk b/buildroot/package/dropwatch/dropwatch.mk
similarity index 100%
rename from software/package/dropwatch/dropwatch.mk
rename to buildroot/package/dropwatch/dropwatch.mk
diff --git a/software/package/dstat/Config.in b/buildroot/package/dstat/Config.in
similarity index 100%
rename from software/package/dstat/Config.in
rename to buildroot/package/dstat/Config.in
diff --git a/software/package/dstat/dstat.hash b/buildroot/package/dstat/dstat.hash
similarity index 100%
rename from software/package/dstat/dstat.hash
rename to buildroot/package/dstat/dstat.hash
diff --git a/software/package/dstat/dstat.mk b/buildroot/package/dstat/dstat.mk
similarity index 100%
rename from software/package/dstat/dstat.mk
rename to buildroot/package/dstat/dstat.mk
diff --git a/software/package/dt-utils/Config.in b/buildroot/package/dt-utils/Config.in
similarity index 100%
rename from software/package/dt-utils/Config.in
rename to buildroot/package/dt-utils/Config.in
diff --git a/software/package/dt-utils/dt-utils.hash b/buildroot/package/dt-utils/dt-utils.hash
similarity index 100%
rename from software/package/dt-utils/dt-utils.hash
rename to buildroot/package/dt-utils/dt-utils.hash
diff --git a/software/package/dt-utils/dt-utils.mk b/buildroot/package/dt-utils/dt-utils.mk
similarity index 100%
rename from software/package/dt-utils/dt-utils.mk
rename to buildroot/package/dt-utils/dt-utils.mk
diff --git a/software/package/dt/0001-adjust-os-symlink.patch b/buildroot/package/dt/0001-adjust-os-symlink.patch
similarity index 100%
rename from software/package/dt/0001-adjust-os-symlink.patch
rename to buildroot/package/dt/0001-adjust-os-symlink.patch
diff --git a/software/package/dt/0002-dt-default-source-define.patch b/buildroot/package/dt/0002-dt-default-source-define.patch
similarity index 100%
rename from software/package/dt/0002-dt-default-source-define.patch
rename to buildroot/package/dt/0002-dt-default-source-define.patch
diff --git a/software/package/dt/Config.in b/buildroot/package/dt/Config.in
similarity index 100%
rename from software/package/dt/Config.in
rename to buildroot/package/dt/Config.in
diff --git a/software/package/dt/dt.hash b/buildroot/package/dt/dt.hash
similarity index 100%
rename from software/package/dt/dt.hash
rename to buildroot/package/dt/dt.hash
diff --git a/software/package/dt/dt.mk b/buildroot/package/dt/dt.mk
similarity index 100%
rename from software/package/dt/dt.mk
rename to buildroot/package/dt/dt.mk
diff --git a/software/package/dtach/Config.in b/buildroot/package/dtach/Config.in
similarity index 100%
rename from software/package/dtach/Config.in
rename to buildroot/package/dtach/Config.in
diff --git a/software/package/dtach/dtach.hash b/buildroot/package/dtach/dtach.hash
similarity index 100%
rename from software/package/dtach/dtach.hash
rename to buildroot/package/dtach/dtach.hash
diff --git a/software/package/dtach/dtach.mk b/buildroot/package/dtach/dtach.mk
similarity index 100%
rename from software/package/dtach/dtach.mk
rename to buildroot/package/dtach/dtach.mk
diff --git a/software/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch
similarity index 100%
rename from software/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch
rename to buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch
diff --git a/software/package/dtc/Config.in b/buildroot/package/dtc/Config.in
similarity index 100%
rename from software/package/dtc/Config.in
rename to buildroot/package/dtc/Config.in
diff --git a/software/package/dtc/Config.in.host b/buildroot/package/dtc/Config.in.host
similarity index 100%
rename from software/package/dtc/Config.in.host
rename to buildroot/package/dtc/Config.in.host
diff --git a/software/package/dtc/dtc.hash b/buildroot/package/dtc/dtc.hash
similarity index 100%
rename from software/package/dtc/dtc.hash
rename to buildroot/package/dtc/dtc.hash
diff --git a/software/package/dtc/dtc.mk b/buildroot/package/dtc/dtc.mk
similarity index 100%
rename from software/package/dtc/dtc.mk
rename to buildroot/package/dtc/dtc.mk
diff --git a/software/package/dtv-scan-tables/Config.in b/buildroot/package/dtv-scan-tables/Config.in
similarity index 100%
rename from software/package/dtv-scan-tables/Config.in
rename to buildroot/package/dtv-scan-tables/Config.in
diff --git a/software/package/dtv-scan-tables/dtv-scan-tables.hash b/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash
similarity index 100%
rename from software/package/dtv-scan-tables/dtv-scan-tables.hash
rename to buildroot/package/dtv-scan-tables/dtv-scan-tables.hash
diff --git a/software/package/dtv-scan-tables/dtv-scan-tables.mk b/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk
similarity index 100%
rename from software/package/dtv-scan-tables/dtv-scan-tables.mk
rename to buildroot/package/dtv-scan-tables/dtv-scan-tables.mk
diff --git a/software/package/duktape/Config.in b/buildroot/package/duktape/Config.in
similarity index 100%
rename from software/package/duktape/Config.in
rename to buildroot/package/duktape/Config.in
diff --git a/software/package/duktape/duktape.hash b/buildroot/package/duktape/duktape.hash
similarity index 100%
rename from software/package/duktape/duktape.hash
rename to buildroot/package/duktape/duktape.hash
diff --git a/software/package/duktape/duktape.mk b/buildroot/package/duktape/duktape.mk
similarity index 100%
rename from software/package/duktape/duktape.mk
rename to buildroot/package/duktape/duktape.mk
diff --git a/software/package/duma/0001-fix-cross-compilation.patch b/buildroot/package/duma/0001-fix-cross-compilation.patch
similarity index 100%
rename from software/package/duma/0001-fix-cross-compilation.patch
rename to buildroot/package/duma/0001-fix-cross-compilation.patch
diff --git a/software/package/duma/0002-no-tests.patch b/buildroot/package/duma/0002-no-tests.patch
similarity index 100%
rename from software/package/duma/0002-no-tests.patch
rename to buildroot/package/duma/0002-no-tests.patch
diff --git a/software/package/duma/0003-fix-C++14.patch b/buildroot/package/duma/0003-fix-C++14.patch
similarity index 100%
rename from software/package/duma/0003-fix-C++14.patch
rename to buildroot/package/duma/0003-fix-C++14.patch
diff --git a/software/package/duma/0004-Fix-build-with-latest-glibc.patch b/buildroot/package/duma/0004-Fix-build-with-latest-glibc.patch
similarity index 100%
rename from software/package/duma/0004-Fix-build-with-latest-glibc.patch
rename to buildroot/package/duma/0004-Fix-build-with-latest-glibc.patch
diff --git a/software/package/duma/Config.in b/buildroot/package/duma/Config.in
similarity index 100%
rename from software/package/duma/Config.in
rename to buildroot/package/duma/Config.in
diff --git a/software/package/duma/duma.hash b/buildroot/package/duma/duma.hash
similarity index 100%
rename from software/package/duma/duma.hash
rename to buildroot/package/duma/duma.hash
diff --git a/software/package/duma/duma.mk b/buildroot/package/duma/duma.mk
similarity index 100%
rename from software/package/duma/duma.mk
rename to buildroot/package/duma/duma.mk
diff --git a/software/package/dump1090/Config.in b/buildroot/package/dump1090/Config.in
similarity index 100%
rename from software/package/dump1090/Config.in
rename to buildroot/package/dump1090/Config.in
diff --git a/software/package/dump1090/dump1090.hash b/buildroot/package/dump1090/dump1090.hash
similarity index 100%
rename from software/package/dump1090/dump1090.hash
rename to buildroot/package/dump1090/dump1090.hash
diff --git a/software/package/dump1090/dump1090.mk b/buildroot/package/dump1090/dump1090.mk
similarity index 100%
rename from software/package/dump1090/dump1090.mk
rename to buildroot/package/dump1090/dump1090.mk
diff --git a/software/package/dvb-apps/0001-Fix-generate-keynames.patch b/buildroot/package/dvb-apps/0001-Fix-generate-keynames.patch
similarity index 100%
rename from software/package/dvb-apps/0001-Fix-generate-keynames.patch
rename to buildroot/package/dvb-apps/0001-Fix-generate-keynames.patch
diff --git a/software/package/dvb-apps/0002-Fix-compiler-warning-flags.patch b/buildroot/package/dvb-apps/0002-Fix-compiler-warning-flags.patch
similarity index 100%
rename from software/package/dvb-apps/0002-Fix-compiler-warning-flags.patch
rename to buildroot/package/dvb-apps/0002-Fix-compiler-warning-flags.patch
diff --git a/software/package/dvb-apps/0003-handle-static-shared-only-build.patch b/buildroot/package/dvb-apps/0003-handle-static-shared-only-build.patch
similarity index 100%
rename from software/package/dvb-apps/0003-handle-static-shared-only-build.patch
rename to buildroot/package/dvb-apps/0003-handle-static-shared-only-build.patch
diff --git a/software/package/dvb-apps/0004-Makefile-remove-test.patch b/buildroot/package/dvb-apps/0004-Makefile-remove-test.patch
similarity index 100%
rename from software/package/dvb-apps/0004-Makefile-remove-test.patch
rename to buildroot/package/dvb-apps/0004-Makefile-remove-test.patch
diff --git a/software/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch b/buildroot/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch
similarity index 100%
rename from software/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch
rename to buildroot/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch
diff --git a/software/package/dvb-apps/Config.in b/buildroot/package/dvb-apps/Config.in
similarity index 100%
rename from software/package/dvb-apps/Config.in
rename to buildroot/package/dvb-apps/Config.in
diff --git a/software/package/dvb-apps/dvb-apps.hash b/buildroot/package/dvb-apps/dvb-apps.hash
similarity index 100%
rename from software/package/dvb-apps/dvb-apps.hash
rename to buildroot/package/dvb-apps/dvb-apps.hash
diff --git a/software/package/dvb-apps/dvb-apps.mk b/buildroot/package/dvb-apps/dvb-apps.mk
similarity index 100%
rename from software/package/dvb-apps/dvb-apps.mk
rename to buildroot/package/dvb-apps/dvb-apps.mk
diff --git a/software/package/dvblast/0001-missing-lm.patch b/buildroot/package/dvblast/0001-missing-lm.patch
similarity index 100%
rename from software/package/dvblast/0001-missing-lm.patch
rename to buildroot/package/dvblast/0001-missing-lm.patch
diff --git a/software/package/dvblast/0002-fix-int-types.patch b/buildroot/package/dvblast/0002-fix-int-types.patch
similarity index 100%
rename from software/package/dvblast/0002-fix-int-types.patch
rename to buildroot/package/dvblast/0002-fix-int-types.patch
diff --git a/software/package/dvblast/Config.in b/buildroot/package/dvblast/Config.in
similarity index 100%
rename from software/package/dvblast/Config.in
rename to buildroot/package/dvblast/Config.in
diff --git a/software/package/dvblast/dvblast.hash b/buildroot/package/dvblast/dvblast.hash
similarity index 100%
rename from software/package/dvblast/dvblast.hash
rename to buildroot/package/dvblast/dvblast.hash
diff --git a/software/package/dvblast/dvblast.mk b/buildroot/package/dvblast/dvblast.mk
similarity index 100%
rename from software/package/dvblast/dvblast.mk
rename to buildroot/package/dvblast/dvblast.mk
diff --git a/software/package/dvbsnoop/0001-musl-types-h.patch b/buildroot/package/dvbsnoop/0001-musl-types-h.patch
similarity index 100%
rename from software/package/dvbsnoop/0001-musl-types-h.patch
rename to buildroot/package/dvbsnoop/0001-musl-types-h.patch
diff --git a/software/package/dvbsnoop/Config.in b/buildroot/package/dvbsnoop/Config.in
similarity index 100%
rename from software/package/dvbsnoop/Config.in
rename to buildroot/package/dvbsnoop/Config.in
diff --git a/software/package/dvbsnoop/dvbsnoop.hash b/buildroot/package/dvbsnoop/dvbsnoop.hash
similarity index 100%
rename from software/package/dvbsnoop/dvbsnoop.hash
rename to buildroot/package/dvbsnoop/dvbsnoop.hash
diff --git a/software/package/dvbsnoop/dvbsnoop.mk b/buildroot/package/dvbsnoop/dvbsnoop.mk
similarity index 100%
rename from software/package/dvbsnoop/dvbsnoop.mk
rename to buildroot/package/dvbsnoop/dvbsnoop.mk
diff --git a/software/package/dvdauthor/Config.in b/buildroot/package/dvdauthor/Config.in
similarity index 100%
rename from software/package/dvdauthor/Config.in
rename to buildroot/package/dvdauthor/Config.in
diff --git a/software/package/dvdauthor/dvdauthor.hash b/buildroot/package/dvdauthor/dvdauthor.hash
similarity index 100%
rename from software/package/dvdauthor/dvdauthor.hash
rename to buildroot/package/dvdauthor/dvdauthor.hash
diff --git a/software/package/dvdauthor/dvdauthor.mk b/buildroot/package/dvdauthor/dvdauthor.mk
similarity index 100%
rename from software/package/dvdauthor/dvdauthor.mk
rename to buildroot/package/dvdauthor/dvdauthor.mk
diff --git a/software/package/dvdrw-tools/0001-limits.h.patch b/buildroot/package/dvdrw-tools/0001-limits.h.patch
similarity index 100%
rename from software/package/dvdrw-tools/0001-limits.h.patch
rename to buildroot/package/dvdrw-tools/0001-limits.h.patch
diff --git a/software/package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch b/buildroot/package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch
similarity index 100%
rename from software/package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch
rename to buildroot/package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch
diff --git a/software/package/dvdrw-tools/Config.in b/buildroot/package/dvdrw-tools/Config.in
similarity index 100%
rename from software/package/dvdrw-tools/Config.in
rename to buildroot/package/dvdrw-tools/Config.in
diff --git a/software/package/dvdrw-tools/dvdrw-tools.hash b/buildroot/package/dvdrw-tools/dvdrw-tools.hash
similarity index 100%
rename from software/package/dvdrw-tools/dvdrw-tools.hash
rename to buildroot/package/dvdrw-tools/dvdrw-tools.hash
diff --git a/software/package/dvdrw-tools/dvdrw-tools.mk b/buildroot/package/dvdrw-tools/dvdrw-tools.mk
similarity index 100%
rename from software/package/dvdrw-tools/dvdrw-tools.mk
rename to buildroot/package/dvdrw-tools/dvdrw-tools.mk
diff --git a/software/package/e2fsprogs/Config.in b/buildroot/package/e2fsprogs/Config.in
similarity index 100%
rename from software/package/e2fsprogs/Config.in
rename to buildroot/package/e2fsprogs/Config.in
diff --git a/software/package/e2fsprogs/Config.in.host b/buildroot/package/e2fsprogs/Config.in.host
similarity index 100%
rename from software/package/e2fsprogs/Config.in.host
rename to buildroot/package/e2fsprogs/Config.in.host
diff --git a/software/package/e2fsprogs/e2fsprogs.hash b/buildroot/package/e2fsprogs/e2fsprogs.hash
similarity index 100%
rename from software/package/e2fsprogs/e2fsprogs.hash
rename to buildroot/package/e2fsprogs/e2fsprogs.hash
diff --git a/software/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk
similarity index 100%
rename from software/package/e2fsprogs/e2fsprogs.mk
rename to buildroot/package/e2fsprogs/e2fsprogs.mk
diff --git a/software/package/e2tools/Config.in b/buildroot/package/e2tools/Config.in
similarity index 100%
rename from software/package/e2tools/Config.in
rename to buildroot/package/e2tools/Config.in
diff --git a/software/package/e2tools/Config.in.host b/buildroot/package/e2tools/Config.in.host
similarity index 100%
rename from software/package/e2tools/Config.in.host
rename to buildroot/package/e2tools/Config.in.host
diff --git a/software/package/e2tools/e2tools.hash b/buildroot/package/e2tools/e2tools.hash
similarity index 100%
rename from software/package/e2tools/e2tools.hash
rename to buildroot/package/e2tools/e2tools.hash
diff --git a/software/package/e2tools/e2tools.mk b/buildroot/package/e2tools/e2tools.mk
similarity index 100%
rename from software/package/e2tools/e2tools.mk
rename to buildroot/package/e2tools/e2tools.mk
diff --git a/software/package/easy-rsa/Config.in b/buildroot/package/easy-rsa/Config.in
similarity index 100%
rename from software/package/easy-rsa/Config.in
rename to buildroot/package/easy-rsa/Config.in
diff --git a/software/package/easy-rsa/easy-rsa.hash b/buildroot/package/easy-rsa/easy-rsa.hash
similarity index 100%
rename from software/package/easy-rsa/easy-rsa.hash
rename to buildroot/package/easy-rsa/easy-rsa.hash
diff --git a/software/package/easy-rsa/easy-rsa.mk b/buildroot/package/easy-rsa/easy-rsa.mk
similarity index 100%
rename from software/package/easy-rsa/easy-rsa.mk
rename to buildroot/package/easy-rsa/easy-rsa.mk
diff --git a/software/package/easydbus/Config.in b/buildroot/package/easydbus/Config.in
similarity index 100%
rename from software/package/easydbus/Config.in
rename to buildroot/package/easydbus/Config.in
diff --git a/software/package/easydbus/easydbus.hash b/buildroot/package/easydbus/easydbus.hash
similarity index 100%
rename from software/package/easydbus/easydbus.hash
rename to buildroot/package/easydbus/easydbus.hash
diff --git a/software/package/easydbus/easydbus.mk b/buildroot/package/easydbus/easydbus.mk
similarity index 100%
rename from software/package/easydbus/easydbus.mk
rename to buildroot/package/easydbus/easydbus.mk
diff --git a/software/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
similarity index 100%
rename from software/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
rename to buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
diff --git a/software/package/ebtables/0002-Fix-musl-compatibility.patch b/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch
similarity index 100%
rename from software/package/ebtables/0002-Fix-musl-compatibility.patch
rename to buildroot/package/ebtables/0002-Fix-musl-compatibility.patch
diff --git a/software/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch b/buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch
similarity index 100%
rename from software/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch
rename to buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch
diff --git a/software/package/ebtables/Config.in b/buildroot/package/ebtables/Config.in
similarity index 100%
rename from software/package/ebtables/Config.in
rename to buildroot/package/ebtables/Config.in
diff --git a/software/package/ebtables/ebtables.hash b/buildroot/package/ebtables/ebtables.hash
similarity index 100%
rename from software/package/ebtables/ebtables.hash
rename to buildroot/package/ebtables/ebtables.hash
diff --git a/software/package/ebtables/ebtables.mk b/buildroot/package/ebtables/ebtables.mk
similarity index 100%
rename from software/package/ebtables/ebtables.mk
rename to buildroot/package/ebtables/ebtables.mk
diff --git a/software/package/ecryptfs-utils/0001-musl.patch b/buildroot/package/ecryptfs-utils/0001-musl.patch
similarity index 100%
rename from software/package/ecryptfs-utils/0001-musl.patch
rename to buildroot/package/ecryptfs-utils/0001-musl.patch
diff --git a/software/package/ecryptfs-utils/0002-openssl110.patch b/buildroot/package/ecryptfs-utils/0002-openssl110.patch
similarity index 100%
rename from software/package/ecryptfs-utils/0002-openssl110.patch
rename to buildroot/package/ecryptfs-utils/0002-openssl110.patch
diff --git a/software/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch b/buildroot/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch
similarity index 100%
rename from software/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch
rename to buildroot/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch
diff --git a/software/package/ecryptfs-utils/Config.in b/buildroot/package/ecryptfs-utils/Config.in
similarity index 100%
rename from software/package/ecryptfs-utils/Config.in
rename to buildroot/package/ecryptfs-utils/Config.in
diff --git a/software/package/ecryptfs-utils/ecryptfs-utils.hash b/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash
similarity index 100%
rename from software/package/ecryptfs-utils/ecryptfs-utils.hash
rename to buildroot/package/ecryptfs-utils/ecryptfs-utils.hash
diff --git a/software/package/ecryptfs-utils/ecryptfs-utils.mk b/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk
similarity index 100%
rename from software/package/ecryptfs-utils/ecryptfs-utils.mk
rename to buildroot/package/ecryptfs-utils/ecryptfs-utils.mk
diff --git a/software/package/ed/Config.in b/buildroot/package/ed/Config.in
similarity index 100%
rename from software/package/ed/Config.in
rename to buildroot/package/ed/Config.in
diff --git a/software/package/ed/ed.hash b/buildroot/package/ed/ed.hash
similarity index 100%
rename from software/package/ed/ed.hash
rename to buildroot/package/ed/ed.hash
diff --git a/software/package/ed/ed.mk b/buildroot/package/ed/ed.mk
similarity index 100%
rename from software/package/ed/ed.mk
rename to buildroot/package/ed/ed.mk
diff --git a/software/package/edid-decode/Config.in b/buildroot/package/edid-decode/Config.in
similarity index 100%
rename from software/package/edid-decode/Config.in
rename to buildroot/package/edid-decode/Config.in
diff --git a/software/package/edid-decode/edid-decode.hash b/buildroot/package/edid-decode/edid-decode.hash
similarity index 100%
rename from software/package/edid-decode/edid-decode.hash
rename to buildroot/package/edid-decode/edid-decode.hash
diff --git a/software/package/edid-decode/edid-decode.mk b/buildroot/package/edid-decode/edid-decode.mk
similarity index 100%
rename from software/package/edid-decode/edid-decode.mk
rename to buildroot/package/edid-decode/edid-decode.mk
diff --git a/software/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/buildroot/package/efibootmgr/0001-Allow-build-with-uClibc.patch
similarity index 100%
rename from software/package/efibootmgr/0001-Allow-build-with-uClibc.patch
rename to buildroot/package/efibootmgr/0001-Allow-build-with-uClibc.patch
diff --git a/software/package/efibootmgr/Config.in b/buildroot/package/efibootmgr/Config.in
similarity index 100%
rename from software/package/efibootmgr/Config.in
rename to buildroot/package/efibootmgr/Config.in
diff --git a/software/package/efibootmgr/efibootmgr.hash b/buildroot/package/efibootmgr/efibootmgr.hash
similarity index 100%
rename from software/package/efibootmgr/efibootmgr.hash
rename to buildroot/package/efibootmgr/efibootmgr.hash
diff --git a/software/package/efibootmgr/efibootmgr.mk b/buildroot/package/efibootmgr/efibootmgr.mk
similarity index 100%
rename from software/package/efibootmgr/efibootmgr.mk
rename to buildroot/package/efibootmgr/efibootmgr.mk
diff --git a/software/package/efivar/0001-Allow-build-with-uClibc.patch b/buildroot/package/efivar/0001-Allow-build-with-uClibc.patch
similarity index 100%
rename from software/package/efivar/0001-Allow-build-with-uClibc.patch
rename to buildroot/package/efivar/0001-Allow-build-with-uClibc.patch
diff --git a/software/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/buildroot/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
similarity index 100%
rename from software/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
rename to buildroot/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
diff --git a/software/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/buildroot/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch
similarity index 100%
rename from software/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch
rename to buildroot/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch
diff --git a/software/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch b/buildroot/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch
similarity index 100%
rename from software/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch
rename to buildroot/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch
diff --git a/software/package/efivar/Config.in b/buildroot/package/efivar/Config.in
similarity index 100%
rename from software/package/efivar/Config.in
rename to buildroot/package/efivar/Config.in
diff --git a/software/package/efivar/efivar.hash b/buildroot/package/efivar/efivar.hash
similarity index 100%
rename from software/package/efivar/efivar.hash
rename to buildroot/package/efivar/efivar.hash
diff --git a/software/package/efivar/efivar.mk b/buildroot/package/efivar/efivar.mk
similarity index 100%
rename from software/package/efivar/efivar.mk
rename to buildroot/package/efivar/efivar.mk
diff --git a/software/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch b/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch
similarity index 100%
rename from software/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch
rename to buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch
diff --git a/software/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch b/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch
similarity index 100%
rename from software/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch
rename to buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch
diff --git a/software/package/efl/Config.in b/buildroot/package/efl/Config.in
similarity index 100%
rename from software/package/efl/Config.in
rename to buildroot/package/efl/Config.in
diff --git a/software/package/efl/efl.hash b/buildroot/package/efl/efl.hash
similarity index 100%
rename from software/package/efl/efl.hash
rename to buildroot/package/efl/efl.hash
diff --git a/software/package/efl/efl.mk b/buildroot/package/efl/efl.mk
similarity index 100%
rename from software/package/efl/efl.mk
rename to buildroot/package/efl/efl.mk
diff --git a/software/package/eigen/Config.in b/buildroot/package/eigen/Config.in
similarity index 100%
rename from software/package/eigen/Config.in
rename to buildroot/package/eigen/Config.in
diff --git a/software/package/eigen/eigen.hash b/buildroot/package/eigen/eigen.hash
similarity index 100%
rename from software/package/eigen/eigen.hash
rename to buildroot/package/eigen/eigen.hash
diff --git a/software/package/eigen/eigen.mk b/buildroot/package/eigen/eigen.mk
similarity index 100%
rename from software/package/eigen/eigen.mk
rename to buildroot/package/eigen/eigen.mk
diff --git a/software/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
similarity index 100%
rename from software/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
rename to buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
diff --git a/software/package/ejabberd/0002-fix-ejabberdctl.patch b/buildroot/package/ejabberd/0002-fix-ejabberdctl.patch
similarity index 100%
rename from software/package/ejabberd/0002-fix-ejabberdctl.patch
rename to buildroot/package/ejabberd/0002-fix-ejabberdctl.patch
diff --git a/software/package/ejabberd/Config.in b/buildroot/package/ejabberd/Config.in
similarity index 100%
rename from software/package/ejabberd/Config.in
rename to buildroot/package/ejabberd/Config.in
diff --git a/software/package/ejabberd/S50ejabberd b/buildroot/package/ejabberd/S50ejabberd
similarity index 100%
rename from software/package/ejabberd/S50ejabberd
rename to buildroot/package/ejabberd/S50ejabberd
diff --git a/software/package/ejabberd/check-erlang-lib b/buildroot/package/ejabberd/check-erlang-lib
similarity index 100%
rename from software/package/ejabberd/check-erlang-lib
rename to buildroot/package/ejabberd/check-erlang-lib
diff --git a/software/package/ejabberd/ejabberd.hash b/buildroot/package/ejabberd/ejabberd.hash
similarity index 100%
rename from software/package/ejabberd/ejabberd.hash
rename to buildroot/package/ejabberd/ejabberd.hash
diff --git a/software/package/ejabberd/ejabberd.mk b/buildroot/package/ejabberd/ejabberd.mk
similarity index 100%
rename from software/package/ejabberd/ejabberd.mk
rename to buildroot/package/ejabberd/ejabberd.mk
diff --git a/software/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch b/buildroot/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch
similarity index 100%
rename from software/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch
rename to buildroot/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch
diff --git a/software/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch b/buildroot/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch
similarity index 100%
rename from software/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch
rename to buildroot/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch
diff --git a/software/package/elf2flt/Config.in.host b/buildroot/package/elf2flt/Config.in.host
similarity index 100%
rename from software/package/elf2flt/Config.in.host
rename to buildroot/package/elf2flt/Config.in.host
diff --git a/software/package/elf2flt/elf2flt.hash b/buildroot/package/elf2flt/elf2flt.hash
similarity index 100%
rename from software/package/elf2flt/elf2flt.hash
rename to buildroot/package/elf2flt/elf2flt.hash
diff --git a/software/package/elf2flt/elf2flt.mk b/buildroot/package/elf2flt/elf2flt.mk
similarity index 100%
rename from software/package/elf2flt/elf2flt.mk
rename to buildroot/package/elf2flt/elf2flt.mk
diff --git a/software/package/elftosb/0001-fixes-includes.patch b/buildroot/package/elftosb/0001-fixes-includes.patch
similarity index 100%
rename from software/package/elftosb/0001-fixes-includes.patch
rename to buildroot/package/elftosb/0001-fixes-includes.patch
diff --git a/software/package/elftosb/0002-force-cxx-compiler.patch b/buildroot/package/elftosb/0002-force-cxx-compiler.patch
similarity index 100%
rename from software/package/elftosb/0002-force-cxx-compiler.patch
rename to buildroot/package/elftosb/0002-force-cxx-compiler.patch
diff --git a/software/package/elftosb/elftosb.hash b/buildroot/package/elftosb/elftosb.hash
similarity index 100%
rename from software/package/elftosb/elftosb.hash
rename to buildroot/package/elftosb/elftosb.hash
diff --git a/software/package/elftosb/elftosb.mk b/buildroot/package/elftosb/elftosb.mk
similarity index 100%
rename from software/package/elftosb/elftosb.mk
rename to buildroot/package/elftosb/elftosb.mk
diff --git a/software/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch b/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch
similarity index 100%
rename from software/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch
rename to buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch
diff --git a/software/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/buildroot/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch
similarity index 100%
rename from software/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch
rename to buildroot/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch
diff --git a/software/package/elfutils/Config.in b/buildroot/package/elfutils/Config.in
similarity index 100%
rename from software/package/elfutils/Config.in
rename to buildroot/package/elfutils/Config.in
diff --git a/software/package/elfutils/elfutils.hash b/buildroot/package/elfutils/elfutils.hash
similarity index 100%
rename from software/package/elfutils/elfutils.hash
rename to buildroot/package/elfutils/elfutils.hash
diff --git a/software/package/elfutils/elfutils.mk b/buildroot/package/elfutils/elfutils.mk
similarity index 100%
rename from software/package/elfutils/elfutils.mk
rename to buildroot/package/elfutils/elfutils.mk
diff --git a/software/package/elixir/elixir.hash b/buildroot/package/elixir/elixir.hash
similarity index 100%
rename from software/package/elixir/elixir.hash
rename to buildroot/package/elixir/elixir.hash
diff --git a/software/package/elixir/elixir.mk b/buildroot/package/elixir/elixir.mk
similarity index 100%
rename from software/package/elixir/elixir.mk
rename to buildroot/package/elixir/elixir.mk
diff --git a/software/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch b/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
similarity index 100%
rename from software/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
rename to buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
diff --git a/software/package/ell/Config.in b/buildroot/package/ell/Config.in
similarity index 100%
rename from software/package/ell/Config.in
rename to buildroot/package/ell/Config.in
diff --git a/software/package/ell/ell.hash b/buildroot/package/ell/ell.hash
similarity index 100%
rename from software/package/ell/ell.hash
rename to buildroot/package/ell/ell.hash
diff --git a/software/package/ell/ell.mk b/buildroot/package/ell/ell.mk
similarity index 100%
rename from software/package/ell/ell.mk
rename to buildroot/package/ell/ell.mk
diff --git a/software/package/emlog/Config.in b/buildroot/package/emlog/Config.in
similarity index 100%
rename from software/package/emlog/Config.in
rename to buildroot/package/emlog/Config.in
diff --git a/software/package/emlog/emlog.hash b/buildroot/package/emlog/emlog.hash
similarity index 100%
rename from software/package/emlog/emlog.hash
rename to buildroot/package/emlog/emlog.hash
diff --git a/software/package/emlog/emlog.mk b/buildroot/package/emlog/emlog.mk
similarity index 100%
rename from software/package/emlog/emlog.mk
rename to buildroot/package/emlog/emlog.mk
diff --git a/software/package/empty/0001-respect-LDFLAGS.patch b/buildroot/package/empty/0001-respect-LDFLAGS.patch
similarity index 100%
rename from software/package/empty/0001-respect-LDFLAGS.patch
rename to buildroot/package/empty/0001-respect-LDFLAGS.patch
diff --git a/software/package/empty/Config.in b/buildroot/package/empty/Config.in
similarity index 100%
rename from software/package/empty/Config.in
rename to buildroot/package/empty/Config.in
diff --git a/software/package/empty/empty.hash b/buildroot/package/empty/empty.hash
similarity index 100%
rename from software/package/empty/empty.hash
rename to buildroot/package/empty/empty.hash
diff --git a/software/package/empty/empty.mk b/buildroot/package/empty/empty.mk
similarity index 100%
rename from software/package/empty/empty.mk
rename to buildroot/package/empty/empty.mk
diff --git a/software/package/enchant/Config.in b/buildroot/package/enchant/Config.in
similarity index 100%
rename from software/package/enchant/Config.in
rename to buildroot/package/enchant/Config.in
diff --git a/software/package/enchant/enchant.hash b/buildroot/package/enchant/enchant.hash
similarity index 100%
rename from software/package/enchant/enchant.hash
rename to buildroot/package/enchant/enchant.hash
diff --git a/software/package/enchant/enchant.mk b/buildroot/package/enchant/enchant.mk
similarity index 100%
rename from software/package/enchant/enchant.mk
rename to buildroot/package/enchant/enchant.mk
diff --git a/software/package/enet/Config.in b/buildroot/package/enet/Config.in
similarity index 100%
rename from software/package/enet/Config.in
rename to buildroot/package/enet/Config.in
diff --git a/software/package/enet/enet.hash b/buildroot/package/enet/enet.hash
similarity index 100%
rename from software/package/enet/enet.hash
rename to buildroot/package/enet/enet.hash
diff --git a/software/package/enet/enet.mk b/buildroot/package/enet/enet.mk
similarity index 100%
rename from software/package/enet/enet.mk
rename to buildroot/package/enet/enet.mk
diff --git a/software/package/enlightenment/Config.in b/buildroot/package/enlightenment/Config.in
similarity index 100%
rename from software/package/enlightenment/Config.in
rename to buildroot/package/enlightenment/Config.in
diff --git a/software/package/enlightenment/enlightenment.hash b/buildroot/package/enlightenment/enlightenment.hash
similarity index 100%
rename from software/package/enlightenment/enlightenment.hash
rename to buildroot/package/enlightenment/enlightenment.hash
diff --git a/software/package/enlightenment/enlightenment.mk b/buildroot/package/enlightenment/enlightenment.mk
similarity index 100%
rename from software/package/enlightenment/enlightenment.mk
rename to buildroot/package/enlightenment/enlightenment.mk
diff --git a/software/package/enscript/Config.in b/buildroot/package/enscript/Config.in
similarity index 100%
rename from software/package/enscript/Config.in
rename to buildroot/package/enscript/Config.in
diff --git a/software/package/enscript/enscript.hash b/buildroot/package/enscript/enscript.hash
similarity index 100%
rename from software/package/enscript/enscript.hash
rename to buildroot/package/enscript/enscript.hash
diff --git a/software/package/enscript/enscript.mk b/buildroot/package/enscript/enscript.mk
similarity index 100%
rename from software/package/enscript/enscript.mk
rename to buildroot/package/enscript/enscript.mk
diff --git a/software/package/erlang-base64url/Config.in b/buildroot/package/erlang-base64url/Config.in
similarity index 100%
rename from software/package/erlang-base64url/Config.in
rename to buildroot/package/erlang-base64url/Config.in
diff --git a/software/package/erlang-base64url/erlang-base64url.hash b/buildroot/package/erlang-base64url/erlang-base64url.hash
similarity index 100%
rename from software/package/erlang-base64url/erlang-base64url.hash
rename to buildroot/package/erlang-base64url/erlang-base64url.hash
diff --git a/software/package/erlang-base64url/erlang-base64url.mk b/buildroot/package/erlang-base64url/erlang-base64url.mk
similarity index 100%
rename from software/package/erlang-base64url/erlang-base64url.mk
rename to buildroot/package/erlang-base64url/erlang-base64url.mk
diff --git a/software/package/erlang-eimp/Config.in b/buildroot/package/erlang-eimp/Config.in
similarity index 100%
rename from software/package/erlang-eimp/Config.in
rename to buildroot/package/erlang-eimp/Config.in
diff --git a/software/package/erlang-eimp/erlang-eimp.hash b/buildroot/package/erlang-eimp/erlang-eimp.hash
similarity index 100%
rename from software/package/erlang-eimp/erlang-eimp.hash
rename to buildroot/package/erlang-eimp/erlang-eimp.hash
diff --git a/software/package/erlang-eimp/erlang-eimp.mk b/buildroot/package/erlang-eimp/erlang-eimp.mk
similarity index 100%
rename from software/package/erlang-eimp/erlang-eimp.mk
rename to buildroot/package/erlang-eimp/erlang-eimp.mk
diff --git a/software/package/erlang-goldrush/Config.in b/buildroot/package/erlang-goldrush/Config.in
similarity index 100%
rename from software/package/erlang-goldrush/Config.in
rename to buildroot/package/erlang-goldrush/Config.in
diff --git a/software/package/erlang-goldrush/erlang-goldrush.hash b/buildroot/package/erlang-goldrush/erlang-goldrush.hash
similarity index 100%
rename from software/package/erlang-goldrush/erlang-goldrush.hash
rename to buildroot/package/erlang-goldrush/erlang-goldrush.hash
diff --git a/software/package/erlang-goldrush/erlang-goldrush.mk b/buildroot/package/erlang-goldrush/erlang-goldrush.mk
similarity index 100%
rename from software/package/erlang-goldrush/erlang-goldrush.mk
rename to buildroot/package/erlang-goldrush/erlang-goldrush.mk
diff --git a/software/package/erlang-idna/Config.in b/buildroot/package/erlang-idna/Config.in
similarity index 100%
rename from software/package/erlang-idna/Config.in
rename to buildroot/package/erlang-idna/Config.in
diff --git a/software/package/erlang-idna/erlang-idna.hash b/buildroot/package/erlang-idna/erlang-idna.hash
similarity index 100%
rename from software/package/erlang-idna/erlang-idna.hash
rename to buildroot/package/erlang-idna/erlang-idna.hash
diff --git a/software/package/erlang-idna/erlang-idna.mk b/buildroot/package/erlang-idna/erlang-idna.mk
similarity index 100%
rename from software/package/erlang-idna/erlang-idna.mk
rename to buildroot/package/erlang-idna/erlang-idna.mk
diff --git a/software/package/erlang-jiffy/Config.in b/buildroot/package/erlang-jiffy/Config.in
similarity index 100%
rename from software/package/erlang-jiffy/Config.in
rename to buildroot/package/erlang-jiffy/Config.in
diff --git a/software/package/erlang-jiffy/erlang-jiffy.hash b/buildroot/package/erlang-jiffy/erlang-jiffy.hash
similarity index 100%
rename from software/package/erlang-jiffy/erlang-jiffy.hash
rename to buildroot/package/erlang-jiffy/erlang-jiffy.hash
diff --git a/software/package/erlang-jiffy/erlang-jiffy.mk b/buildroot/package/erlang-jiffy/erlang-jiffy.mk
similarity index 100%
rename from software/package/erlang-jiffy/erlang-jiffy.mk
rename to buildroot/package/erlang-jiffy/erlang-jiffy.mk
diff --git a/software/package/erlang-jose/Config.in b/buildroot/package/erlang-jose/Config.in
similarity index 100%
rename from software/package/erlang-jose/Config.in
rename to buildroot/package/erlang-jose/Config.in
diff --git a/software/package/erlang-jose/erlang-jose.hash b/buildroot/package/erlang-jose/erlang-jose.hash
similarity index 100%
rename from software/package/erlang-jose/erlang-jose.hash
rename to buildroot/package/erlang-jose/erlang-jose.hash
diff --git a/software/package/erlang-jose/erlang-jose.mk b/buildroot/package/erlang-jose/erlang-jose.mk
similarity index 100%
rename from software/package/erlang-jose/erlang-jose.mk
rename to buildroot/package/erlang-jose/erlang-jose.mk
diff --git a/software/package/erlang-lager/Config.in b/buildroot/package/erlang-lager/Config.in
similarity index 100%
rename from software/package/erlang-lager/Config.in
rename to buildroot/package/erlang-lager/Config.in
diff --git a/software/package/erlang-lager/erlang-lager.hash b/buildroot/package/erlang-lager/erlang-lager.hash
similarity index 100%
rename from software/package/erlang-lager/erlang-lager.hash
rename to buildroot/package/erlang-lager/erlang-lager.hash
diff --git a/software/package/erlang-lager/erlang-lager.mk b/buildroot/package/erlang-lager/erlang-lager.mk
similarity index 100%
rename from software/package/erlang-lager/erlang-lager.mk
rename to buildroot/package/erlang-lager/erlang-lager.mk
diff --git a/software/package/erlang-p1-acme/Config.in b/buildroot/package/erlang-p1-acme/Config.in
similarity index 100%
rename from software/package/erlang-p1-acme/Config.in
rename to buildroot/package/erlang-p1-acme/Config.in
diff --git a/software/package/erlang-p1-acme/erlang-p1-acme.hash b/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash
similarity index 100%
rename from software/package/erlang-p1-acme/erlang-p1-acme.hash
rename to buildroot/package/erlang-p1-acme/erlang-p1-acme.hash
diff --git a/software/package/erlang-p1-acme/erlang-p1-acme.mk b/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk
similarity index 100%
rename from software/package/erlang-p1-acme/erlang-p1-acme.mk
rename to buildroot/package/erlang-p1-acme/erlang-p1-acme.mk
diff --git a/software/package/erlang-p1-cache-tab/Config.in b/buildroot/package/erlang-p1-cache-tab/Config.in
similarity index 100%
rename from software/package/erlang-p1-cache-tab/Config.in
rename to buildroot/package/erlang-p1-cache-tab/Config.in
diff --git a/software/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
similarity index 100%
rename from software/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
rename to buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
diff --git a/software/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
similarity index 100%
rename from software/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
rename to buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
diff --git a/software/package/erlang-p1-mqtree/Config.in b/buildroot/package/erlang-p1-mqtree/Config.in
similarity index 100%
rename from software/package/erlang-p1-mqtree/Config.in
rename to buildroot/package/erlang-p1-mqtree/Config.in
diff --git a/software/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash
similarity index 100%
rename from software/package/erlang-p1-mqtree/erlang-p1-mqtree.hash
rename to buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash
diff --git a/software/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk
similarity index 100%
rename from software/package/erlang-p1-mqtree/erlang-p1-mqtree.mk
rename to buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk
diff --git a/software/package/erlang-p1-oauth2/Config.in b/buildroot/package/erlang-p1-oauth2/Config.in
similarity index 100%
rename from software/package/erlang-p1-oauth2/Config.in
rename to buildroot/package/erlang-p1-oauth2/Config.in
diff --git a/software/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
similarity index 100%
rename from software/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
rename to buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
diff --git a/software/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
similarity index 100%
rename from software/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
rename to buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
diff --git a/software/package/erlang-p1-pkix/Config.in b/buildroot/package/erlang-p1-pkix/Config.in
similarity index 100%
rename from software/package/erlang-p1-pkix/Config.in
rename to buildroot/package/erlang-p1-pkix/Config.in
diff --git a/software/package/erlang-p1-pkix/erlang-p1-pkix.hash b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash
similarity index 100%
rename from software/package/erlang-p1-pkix/erlang-p1-pkix.hash
rename to buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash
diff --git a/software/package/erlang-p1-pkix/erlang-p1-pkix.mk b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk
similarity index 100%
rename from software/package/erlang-p1-pkix/erlang-p1-pkix.mk
rename to buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk
diff --git a/software/package/erlang-p1-sip/0001-fix-includes.patch b/buildroot/package/erlang-p1-sip/0001-fix-includes.patch
similarity index 100%
rename from software/package/erlang-p1-sip/0001-fix-includes.patch
rename to buildroot/package/erlang-p1-sip/0001-fix-includes.patch
diff --git a/software/package/erlang-p1-sip/Config.in b/buildroot/package/erlang-p1-sip/Config.in
similarity index 100%
rename from software/package/erlang-p1-sip/Config.in
rename to buildroot/package/erlang-p1-sip/Config.in
diff --git a/software/package/erlang-p1-sip/erlang-p1-sip.hash b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
similarity index 100%
rename from software/package/erlang-p1-sip/erlang-p1-sip.hash
rename to buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
diff --git a/software/package/erlang-p1-sip/erlang-p1-sip.mk b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
similarity index 100%
rename from software/package/erlang-p1-sip/erlang-p1-sip.mk
rename to buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
diff --git a/software/package/erlang-p1-stringprep/Config.in b/buildroot/package/erlang-p1-stringprep/Config.in
similarity index 100%
rename from software/package/erlang-p1-stringprep/Config.in
rename to buildroot/package/erlang-p1-stringprep/Config.in
diff --git a/software/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
similarity index 100%
rename from software/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
rename to buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
diff --git a/software/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
similarity index 100%
rename from software/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
rename to buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
diff --git a/software/package/erlang-p1-stun/Config.in b/buildroot/package/erlang-p1-stun/Config.in
similarity index 100%
rename from software/package/erlang-p1-stun/Config.in
rename to buildroot/package/erlang-p1-stun/Config.in
diff --git a/software/package/erlang-p1-stun/erlang-p1-stun.hash b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
similarity index 100%
rename from software/package/erlang-p1-stun/erlang-p1-stun.hash
rename to buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
diff --git a/software/package/erlang-p1-stun/erlang-p1-stun.mk b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
similarity index 100%
rename from software/package/erlang-p1-stun/erlang-p1-stun.mk
rename to buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
diff --git a/software/package/erlang-p1-tls/Config.in b/buildroot/package/erlang-p1-tls/Config.in
similarity index 100%
rename from software/package/erlang-p1-tls/Config.in
rename to buildroot/package/erlang-p1-tls/Config.in
diff --git a/software/package/erlang-p1-tls/erlang-p1-tls.hash b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
similarity index 100%
rename from software/package/erlang-p1-tls/erlang-p1-tls.hash
rename to buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
diff --git a/software/package/erlang-p1-tls/erlang-p1-tls.mk b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
similarity index 100%
rename from software/package/erlang-p1-tls/erlang-p1-tls.mk
rename to buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
diff --git a/software/package/erlang-p1-utils/Config.in b/buildroot/package/erlang-p1-utils/Config.in
similarity index 100%
rename from software/package/erlang-p1-utils/Config.in
rename to buildroot/package/erlang-p1-utils/Config.in
diff --git a/software/package/erlang-p1-utils/erlang-p1-utils.hash b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
similarity index 100%
rename from software/package/erlang-p1-utils/erlang-p1-utils.hash
rename to buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
diff --git a/software/package/erlang-p1-utils/erlang-p1-utils.mk b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
similarity index 100%
rename from software/package/erlang-p1-utils/erlang-p1-utils.mk
rename to buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
diff --git a/software/package/erlang-p1-xml/Config.in b/buildroot/package/erlang-p1-xml/Config.in
similarity index 100%
rename from software/package/erlang-p1-xml/Config.in
rename to buildroot/package/erlang-p1-xml/Config.in
diff --git a/software/package/erlang-p1-xml/erlang-p1-xml.hash b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
similarity index 100%
rename from software/package/erlang-p1-xml/erlang-p1-xml.hash
rename to buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
diff --git a/software/package/erlang-p1-xml/erlang-p1-xml.mk b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
similarity index 100%
rename from software/package/erlang-p1-xml/erlang-p1-xml.mk
rename to buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
diff --git a/software/package/erlang-p1-xmpp/0001-fix-includes.patch b/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch
similarity index 100%
rename from software/package/erlang-p1-xmpp/0001-fix-includes.patch
rename to buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch
diff --git a/software/package/erlang-p1-xmpp/Config.in b/buildroot/package/erlang-p1-xmpp/Config.in
similarity index 100%
rename from software/package/erlang-p1-xmpp/Config.in
rename to buildroot/package/erlang-p1-xmpp/Config.in
diff --git a/software/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
similarity index 100%
rename from software/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
rename to buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
diff --git a/software/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
similarity index 100%
rename from software/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
rename to buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
diff --git a/software/package/erlang-p1-yaml/Config.in b/buildroot/package/erlang-p1-yaml/Config.in
similarity index 100%
rename from software/package/erlang-p1-yaml/Config.in
rename to buildroot/package/erlang-p1-yaml/Config.in
diff --git a/software/package/erlang-p1-yaml/erlang-p1-yaml.hash b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
similarity index 100%
rename from software/package/erlang-p1-yaml/erlang-p1-yaml.hash
rename to buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
diff --git a/software/package/erlang-p1-yaml/erlang-p1-yaml.mk b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
similarity index 100%
rename from software/package/erlang-p1-yaml/erlang-p1-yaml.mk
rename to buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
diff --git a/software/package/erlang-p1-yconf/Config.in b/buildroot/package/erlang-p1-yconf/Config.in
similarity index 100%
rename from software/package/erlang-p1-yconf/Config.in
rename to buildroot/package/erlang-p1-yconf/Config.in
diff --git a/software/package/erlang-p1-yconf/erlang-p1-yconf.hash b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash
similarity index 100%
rename from software/package/erlang-p1-yconf/erlang-p1-yconf.hash
rename to buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash
diff --git a/software/package/erlang-p1-yconf/erlang-p1-yconf.mk b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk
similarity index 100%
rename from software/package/erlang-p1-yconf/erlang-p1-yconf.mk
rename to buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk
diff --git a/software/package/erlang-p1-zlib/Config.in b/buildroot/package/erlang-p1-zlib/Config.in
similarity index 100%
rename from software/package/erlang-p1-zlib/Config.in
rename to buildroot/package/erlang-p1-zlib/Config.in
diff --git a/software/package/erlang-p1-zlib/erlang-p1-zlib.hash b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
similarity index 100%
rename from software/package/erlang-p1-zlib/erlang-p1-zlib.hash
rename to buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
diff --git a/software/package/erlang-p1-zlib/erlang-p1-zlib.mk b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
similarity index 100%
rename from software/package/erlang-p1-zlib/erlang-p1-zlib.mk
rename to buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
diff --git a/software/package/erlang-rebar/erlang-rebar.hash b/buildroot/package/erlang-rebar/erlang-rebar.hash
similarity index 100%
rename from software/package/erlang-rebar/erlang-rebar.hash
rename to buildroot/package/erlang-rebar/erlang-rebar.hash
diff --git a/software/package/erlang-rebar/erlang-rebar.mk b/buildroot/package/erlang-rebar/erlang-rebar.mk
similarity index 100%
rename from software/package/erlang-rebar/erlang-rebar.mk
rename to buildroot/package/erlang-rebar/erlang-rebar.mk
diff --git a/software/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/buildroot/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
similarity index 100%
rename from software/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
rename to buildroot/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
diff --git a/software/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch b/buildroot/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
similarity index 100%
rename from software/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
rename to buildroot/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
diff --git a/software/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch b/buildroot/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch
similarity index 100%
rename from software/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch
rename to buildroot/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch
diff --git a/software/package/erlang/Config.in b/buildroot/package/erlang/Config.in
similarity index 100%
rename from software/package/erlang/Config.in
rename to buildroot/package/erlang/Config.in
diff --git a/software/package/erlang/erlang.hash b/buildroot/package/erlang/erlang.hash
similarity index 100%
rename from software/package/erlang/erlang.hash
rename to buildroot/package/erlang/erlang.hash
diff --git a/software/package/erlang/erlang.mk b/buildroot/package/erlang/erlang.mk
similarity index 100%
rename from software/package/erlang/erlang.mk
rename to buildroot/package/erlang/erlang.mk
diff --git a/software/package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch b/buildroot/package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch
similarity index 100%
rename from software/package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch
rename to buildroot/package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch
diff --git a/software/package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch b/buildroot/package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch
similarity index 100%
rename from software/package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch
rename to buildroot/package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch
diff --git a/software/package/espeak/Config.in b/buildroot/package/espeak/Config.in
similarity index 100%
rename from software/package/espeak/Config.in
rename to buildroot/package/espeak/Config.in
diff --git a/software/package/espeak/espeak.hash b/buildroot/package/espeak/espeak.hash
similarity index 100%
rename from software/package/espeak/espeak.hash
rename to buildroot/package/espeak/espeak.hash
diff --git a/software/package/espeak/espeak.mk b/buildroot/package/espeak/espeak.mk
similarity index 100%
rename from software/package/espeak/espeak.mk
rename to buildroot/package/espeak/espeak.mk
diff --git a/software/package/ethtool/Config.in b/buildroot/package/ethtool/Config.in
similarity index 100%
rename from software/package/ethtool/Config.in
rename to buildroot/package/ethtool/Config.in
diff --git a/software/package/ethtool/ethtool.hash b/buildroot/package/ethtool/ethtool.hash
similarity index 100%
rename from software/package/ethtool/ethtool.hash
rename to buildroot/package/ethtool/ethtool.hash
diff --git a/software/package/ethtool/ethtool.mk b/buildroot/package/ethtool/ethtool.mk
similarity index 100%
rename from software/package/ethtool/ethtool.mk
rename to buildroot/package/ethtool/ethtool.mk
diff --git a/software/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch b/buildroot/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch
similarity index 100%
rename from software/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch
rename to buildroot/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch
diff --git a/software/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch b/buildroot/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch
similarity index 100%
rename from software/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch
rename to buildroot/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch
diff --git a/software/package/eudev/Config.in b/buildroot/package/eudev/Config.in
similarity index 100%
rename from software/package/eudev/Config.in
rename to buildroot/package/eudev/Config.in
diff --git a/software/package/eudev/Config.in.host b/buildroot/package/eudev/Config.in.host
similarity index 100%
rename from software/package/eudev/Config.in.host
rename to buildroot/package/eudev/Config.in.host
diff --git a/software/package/eudev/S10udev b/buildroot/package/eudev/S10udev
similarity index 100%
rename from software/package/eudev/S10udev
rename to buildroot/package/eudev/S10udev
diff --git a/software/package/eudev/eudev.hash b/buildroot/package/eudev/eudev.hash
similarity index 100%
rename from software/package/eudev/eudev.hash
rename to buildroot/package/eudev/eudev.hash
diff --git a/software/package/eudev/eudev.mk b/buildroot/package/eudev/eudev.mk
similarity index 100%
rename from software/package/eudev/eudev.mk
rename to buildroot/package/eudev/eudev.mk
diff --git a/software/package/ev3dev-linux-drivers/Config.in b/buildroot/package/ev3dev-linux-drivers/Config.in
similarity index 100%
rename from software/package/ev3dev-linux-drivers/Config.in
rename to buildroot/package/ev3dev-linux-drivers/Config.in
diff --git a/software/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk b/buildroot/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
similarity index 100%
rename from software/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
rename to buildroot/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
diff --git a/software/package/ev3dev-linux-drivers/lego-linux-drivers.hash b/buildroot/package/ev3dev-linux-drivers/lego-linux-drivers.hash
similarity index 100%
rename from software/package/ev3dev-linux-drivers/lego-linux-drivers.hash
rename to buildroot/package/ev3dev-linux-drivers/lego-linux-drivers.hash
diff --git a/software/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch b/buildroot/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch
similarity index 100%
rename from software/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch
rename to buildroot/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch
diff --git a/software/package/evemu/Config.in b/buildroot/package/evemu/Config.in
similarity index 100%
rename from software/package/evemu/Config.in
rename to buildroot/package/evemu/Config.in
diff --git a/software/package/evemu/evemu.hash b/buildroot/package/evemu/evemu.hash
similarity index 100%
rename from software/package/evemu/evemu.hash
rename to buildroot/package/evemu/evemu.hash
diff --git a/software/package/evemu/evemu.mk b/buildroot/package/evemu/evemu.mk
similarity index 100%
rename from software/package/evemu/evemu.mk
rename to buildroot/package/evemu/evemu.mk
diff --git a/software/package/evtest/0001-Add-missing-limits.h-include.patch b/buildroot/package/evtest/0001-Add-missing-limits.h-include.patch
similarity index 100%
rename from software/package/evtest/0001-Add-missing-limits.h-include.patch
rename to buildroot/package/evtest/0001-Add-missing-limits.h-include.patch
diff --git a/software/package/evtest/Config.in b/buildroot/package/evtest/Config.in
similarity index 100%
rename from software/package/evtest/Config.in
rename to buildroot/package/evtest/Config.in
diff --git a/software/package/evtest/evtest.hash b/buildroot/package/evtest/evtest.hash
similarity index 100%
rename from software/package/evtest/evtest.hash
rename to buildroot/package/evtest/evtest.hash
diff --git a/software/package/evtest/evtest.mk b/buildroot/package/evtest/evtest.mk
similarity index 100%
rename from software/package/evtest/evtest.mk
rename to buildroot/package/evtest/evtest.mk
diff --git a/software/package/execline/Config.in b/buildroot/package/execline/Config.in
similarity index 100%
rename from software/package/execline/Config.in
rename to buildroot/package/execline/Config.in
diff --git a/software/package/execline/execline.hash b/buildroot/package/execline/execline.hash
similarity index 100%
rename from software/package/execline/execline.hash
rename to buildroot/package/execline/execline.hash
diff --git a/software/package/execline/execline.mk b/buildroot/package/execline/execline.mk
similarity index 100%
rename from software/package/execline/execline.mk
rename to buildroot/package/execline/execline.mk
diff --git a/software/package/exempi/Config.in b/buildroot/package/exempi/Config.in
similarity index 100%
rename from software/package/exempi/Config.in
rename to buildroot/package/exempi/Config.in
diff --git a/software/package/exempi/exempi.hash b/buildroot/package/exempi/exempi.hash
similarity index 100%
rename from software/package/exempi/exempi.hash
rename to buildroot/package/exempi/exempi.hash
diff --git a/software/package/exempi/exempi.mk b/buildroot/package/exempi/exempi.mk
similarity index 100%
rename from software/package/exempi/exempi.mk
rename to buildroot/package/exempi/exempi.mk
diff --git a/software/package/exfat-utils/Config.in b/buildroot/package/exfat-utils/Config.in
similarity index 100%
rename from software/package/exfat-utils/Config.in
rename to buildroot/package/exfat-utils/Config.in
diff --git a/software/package/exfat-utils/exfat-utils.hash b/buildroot/package/exfat-utils/exfat-utils.hash
similarity index 100%
rename from software/package/exfat-utils/exfat-utils.hash
rename to buildroot/package/exfat-utils/exfat-utils.hash
diff --git a/software/package/exfat-utils/exfat-utils.mk b/buildroot/package/exfat-utils/exfat-utils.mk
similarity index 100%
rename from software/package/exfat-utils/exfat-utils.mk
rename to buildroot/package/exfat-utils/exfat-utils.mk
diff --git a/software/package/exfat/Config.in b/buildroot/package/exfat/Config.in
similarity index 100%
rename from software/package/exfat/Config.in
rename to buildroot/package/exfat/Config.in
diff --git a/software/package/exfat/exfat.hash b/buildroot/package/exfat/exfat.hash
similarity index 100%
rename from software/package/exfat/exfat.hash
rename to buildroot/package/exfat/exfat.hash
diff --git a/software/package/exfat/exfat.mk b/buildroot/package/exfat/exfat.mk
similarity index 100%
rename from software/package/exfat/exfat.mk
rename to buildroot/package/exfat/exfat.mk
diff --git a/software/package/exim/0001-Build-buildconfig-for-the-host.patch b/buildroot/package/exim/0001-Build-buildconfig-for-the-host.patch
similarity index 100%
rename from software/package/exim/0001-Build-buildconfig-for-the-host.patch
rename to buildroot/package/exim/0001-Build-buildconfig-for-the-host.patch
diff --git a/software/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch b/buildroot/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
similarity index 100%
rename from software/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
rename to buildroot/package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch
diff --git a/software/package/exim/0003-Skip-version-check-and-symlink-installation.patch b/buildroot/package/exim/0003-Skip-version-check-and-symlink-installation.patch
similarity index 100%
rename from software/package/exim/0003-Skip-version-check-and-symlink-installation.patch
rename to buildroot/package/exim/0003-Skip-version-check-and-symlink-installation.patch
diff --git a/software/package/exim/0004-Fix-uClibc-build.patch b/buildroot/package/exim/0004-Fix-uClibc-build.patch
similarity index 100%
rename from software/package/exim/0004-Fix-uClibc-build.patch
rename to buildroot/package/exim/0004-Fix-uClibc-build.patch
diff --git a/software/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch b/buildroot/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch
similarity index 100%
rename from software/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch
rename to buildroot/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch
diff --git a/software/package/exim/0006-sieve-fix-build-errors.patch b/buildroot/package/exim/0006-sieve-fix-build-errors.patch
similarity index 100%
rename from software/package/exim/0006-sieve-fix-build-errors.patch
rename to buildroot/package/exim/0006-sieve-fix-build-errors.patch
diff --git a/software/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch b/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch
similarity index 100%
rename from software/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch
rename to buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch
diff --git a/software/package/exim/Config.in b/buildroot/package/exim/Config.in
similarity index 100%
rename from software/package/exim/Config.in
rename to buildroot/package/exim/Config.in
diff --git a/software/package/exim/S86exim b/buildroot/package/exim/S86exim
similarity index 100%
rename from software/package/exim/S86exim
rename to buildroot/package/exim/S86exim
diff --git a/software/package/exim/exim.hash b/buildroot/package/exim/exim.hash
similarity index 100%
rename from software/package/exim/exim.hash
rename to buildroot/package/exim/exim.hash
diff --git a/software/package/exim/exim.mk b/buildroot/package/exim/exim.mk
similarity index 100%
rename from software/package/exim/exim.mk
rename to buildroot/package/exim/exim.mk
diff --git a/software/package/exim/exim.service b/buildroot/package/exim/exim.service
similarity index 100%
rename from software/package/exim/exim.service
rename to buildroot/package/exim/exim.service
diff --git a/software/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch b/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch
similarity index 100%
rename from software/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch
rename to buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch
diff --git a/software/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch b/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch
similarity index 100%
rename from software/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch
rename to buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch
diff --git a/software/package/exiv2/Config.in b/buildroot/package/exiv2/Config.in
similarity index 100%
rename from software/package/exiv2/Config.in
rename to buildroot/package/exiv2/Config.in
diff --git a/software/package/exiv2/exiv2.hash b/buildroot/package/exiv2/exiv2.hash
similarity index 100%
rename from software/package/exiv2/exiv2.hash
rename to buildroot/package/exiv2/exiv2.hash
diff --git a/software/package/exiv2/exiv2.mk b/buildroot/package/exiv2/exiv2.mk
similarity index 100%
rename from software/package/exiv2/exiv2.mk
rename to buildroot/package/exiv2/exiv2.mk
diff --git a/software/package/expat/Config.in b/buildroot/package/expat/Config.in
similarity index 100%
rename from software/package/expat/Config.in
rename to buildroot/package/expat/Config.in
diff --git a/software/package/expat/expat.hash b/buildroot/package/expat/expat.hash
similarity index 100%
rename from software/package/expat/expat.hash
rename to buildroot/package/expat/expat.hash
diff --git a/software/package/expat/expat.mk b/buildroot/package/expat/expat.mk
similarity index 100%
rename from software/package/expat/expat.mk
rename to buildroot/package/expat/expat.mk
diff --git a/software/package/expect/0001-enable-cross-compilation.patch b/buildroot/package/expect/0001-enable-cross-compilation.patch
similarity index 100%
rename from software/package/expect/0001-enable-cross-compilation.patch
rename to buildroot/package/expect/0001-enable-cross-compilation.patch
diff --git a/software/package/expect/0002-allow-tcl-build-directory.patch b/buildroot/package/expect/0002-allow-tcl-build-directory.patch
similarity index 100%
rename from software/package/expect/0002-allow-tcl-build-directory.patch
rename to buildroot/package/expect/0002-allow-tcl-build-directory.patch
diff --git a/software/package/expect/Config.in b/buildroot/package/expect/Config.in
similarity index 100%
rename from software/package/expect/Config.in
rename to buildroot/package/expect/Config.in
diff --git a/software/package/expect/expect.hash b/buildroot/package/expect/expect.hash
similarity index 100%
rename from software/package/expect/expect.hash
rename to buildroot/package/expect/expect.hash
diff --git a/software/package/expect/expect.mk b/buildroot/package/expect/expect.mk
similarity index 100%
rename from software/package/expect/expect.mk
rename to buildroot/package/expect/expect.mk
diff --git a/software/package/explorercanvas/Config.in b/buildroot/package/explorercanvas/Config.in
similarity index 100%
rename from software/package/explorercanvas/Config.in
rename to buildroot/package/explorercanvas/Config.in
diff --git a/software/package/explorercanvas/explorercanvas.hash b/buildroot/package/explorercanvas/explorercanvas.hash
similarity index 100%
rename from software/package/explorercanvas/explorercanvas.hash
rename to buildroot/package/explorercanvas/explorercanvas.hash
diff --git a/software/package/explorercanvas/explorercanvas.mk b/buildroot/package/explorercanvas/explorercanvas.mk
similarity index 100%
rename from software/package/explorercanvas/explorercanvas.mk
rename to buildroot/package/explorercanvas/explorercanvas.mk
diff --git a/software/package/ezxml/0001-allow-compiler-override.patch b/buildroot/package/ezxml/0001-allow-compiler-override.patch
similarity index 100%
rename from software/package/ezxml/0001-allow-compiler-override.patch
rename to buildroot/package/ezxml/0001-allow-compiler-override.patch
diff --git a/software/package/ezxml/Config.in b/buildroot/package/ezxml/Config.in
similarity index 100%
rename from software/package/ezxml/Config.in
rename to buildroot/package/ezxml/Config.in
diff --git a/software/package/ezxml/ezxml.hash b/buildroot/package/ezxml/ezxml.hash
similarity index 100%
rename from software/package/ezxml/ezxml.hash
rename to buildroot/package/ezxml/ezxml.hash
diff --git a/software/package/ezxml/ezxml.mk b/buildroot/package/ezxml/ezxml.mk
similarity index 100%
rename from software/package/ezxml/ezxml.mk
rename to buildroot/package/ezxml/ezxml.mk
diff --git a/software/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch b/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
similarity index 100%
rename from software/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
rename to buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
diff --git a/software/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch b/buildroot/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch
similarity index 100%
rename from software/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch
rename to buildroot/package/f2fs-tools/0002-fsck.f2fs-correct-return-value.patch
diff --git a/software/package/f2fs-tools/Config.in b/buildroot/package/f2fs-tools/Config.in
similarity index 100%
rename from software/package/f2fs-tools/Config.in
rename to buildroot/package/f2fs-tools/Config.in
diff --git a/software/package/f2fs-tools/Config.in.host b/buildroot/package/f2fs-tools/Config.in.host
similarity index 100%
rename from software/package/f2fs-tools/Config.in.host
rename to buildroot/package/f2fs-tools/Config.in.host
diff --git a/software/package/f2fs-tools/f2fs-tools.hash b/buildroot/package/f2fs-tools/f2fs-tools.hash
similarity index 100%
rename from software/package/f2fs-tools/f2fs-tools.hash
rename to buildroot/package/f2fs-tools/f2fs-tools.hash
diff --git a/software/package/f2fs-tools/f2fs-tools.mk b/buildroot/package/f2fs-tools/f2fs-tools.mk
similarity index 100%
rename from software/package/f2fs-tools/f2fs-tools.mk
rename to buildroot/package/f2fs-tools/f2fs-tools.mk
diff --git a/software/package/faad2/Config.in b/buildroot/package/faad2/Config.in
similarity index 100%
rename from software/package/faad2/Config.in
rename to buildroot/package/faad2/Config.in
diff --git a/software/package/faad2/faad2.hash b/buildroot/package/faad2/faad2.hash
similarity index 100%
rename from software/package/faad2/faad2.hash
rename to buildroot/package/faad2/faad2.hash
diff --git a/software/package/faad2/faad2.mk b/buildroot/package/faad2/faad2.mk
similarity index 100%
rename from software/package/faad2/faad2.mk
rename to buildroot/package/faad2/faad2.mk
diff --git a/software/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch b/buildroot/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch
similarity index 100%
rename from software/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch
rename to buildroot/package/faifa/0001-sha2.c-explicitly-include-endian.h-for-BYTE_ORDER-ma.patch
diff --git a/software/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch b/buildroot/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch
similarity index 100%
rename from software/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch
rename to buildroot/package/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch
diff --git a/software/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch b/buildroot/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch
similarity index 100%
rename from software/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch
rename to buildroot/package/faifa/0003-Makefile.in-fix-asbolute-symlink-of-libfaifa.so.patch
diff --git a/software/package/faifa/Config.in b/buildroot/package/faifa/Config.in
similarity index 100%
rename from software/package/faifa/Config.in
rename to buildroot/package/faifa/Config.in
diff --git a/software/package/faifa/faifa.hash b/buildroot/package/faifa/faifa.hash
similarity index 100%
rename from software/package/faifa/faifa.hash
rename to buildroot/package/faifa/faifa.hash
diff --git a/software/package/faifa/faifa.mk b/buildroot/package/faifa/faifa.mk
similarity index 100%
rename from software/package/faifa/faifa.mk
rename to buildroot/package/faifa/faifa.mk
diff --git a/software/package/fail2ban/Config.in b/buildroot/package/fail2ban/Config.in
similarity index 100%
rename from software/package/fail2ban/Config.in
rename to buildroot/package/fail2ban/Config.in
diff --git a/software/package/fail2ban/S60fail2ban b/buildroot/package/fail2ban/S60fail2ban
similarity index 100%
rename from software/package/fail2ban/S60fail2ban
rename to buildroot/package/fail2ban/S60fail2ban
diff --git a/software/package/fail2ban/fail2ban.hash b/buildroot/package/fail2ban/fail2ban.hash
similarity index 100%
rename from software/package/fail2ban/fail2ban.hash
rename to buildroot/package/fail2ban/fail2ban.hash
diff --git a/software/package/fail2ban/fail2ban.mk b/buildroot/package/fail2ban/fail2ban.mk
similarity index 100%
rename from software/package/fail2ban/fail2ban.mk
rename to buildroot/package/fail2ban/fail2ban.mk
diff --git a/software/package/fakedate/fakedate b/buildroot/package/fakedate/fakedate
similarity index 100%
rename from software/package/fakedate/fakedate
rename to buildroot/package/fakedate/fakedate
diff --git a/software/package/fakedate/fakedate.mk b/buildroot/package/fakedate/fakedate.mk
similarity index 100%
rename from software/package/fakedate/fakedate.mk
rename to buildroot/package/fakedate/fakedate.mk
diff --git a/software/package/fakeroot/0001-hide-dlsym-error.patch b/buildroot/package/fakeroot/0001-hide-dlsym-error.patch
similarity index 100%
rename from software/package/fakeroot/0001-hide-dlsym-error.patch
rename to buildroot/package/fakeroot/0001-hide-dlsym-error.patch
diff --git a/software/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch b/buildroot/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch
similarity index 100%
rename from software/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch
rename to buildroot/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch
diff --git a/software/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch b/buildroot/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch
similarity index 100%
rename from software/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch
rename to buildroot/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch
diff --git a/software/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch b/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch
similarity index 100%
rename from software/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch
rename to buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch
diff --git a/software/package/fakeroot/fakeroot.hash b/buildroot/package/fakeroot/fakeroot.hash
similarity index 100%
rename from software/package/fakeroot/fakeroot.hash
rename to buildroot/package/fakeroot/fakeroot.hash
diff --git a/software/package/fakeroot/fakeroot.mk b/buildroot/package/fakeroot/fakeroot.mk
similarity index 100%
rename from software/package/fakeroot/fakeroot.mk
rename to buildroot/package/fakeroot/fakeroot.mk
diff --git a/software/package/faketime/Config.in.host b/buildroot/package/faketime/Config.in.host
similarity index 100%
rename from software/package/faketime/Config.in.host
rename to buildroot/package/faketime/Config.in.host
diff --git a/software/package/faketime/faketime.hash b/buildroot/package/faketime/faketime.hash
similarity index 100%
rename from software/package/faketime/faketime.hash
rename to buildroot/package/faketime/faketime.hash
diff --git a/software/package/faketime/faketime.mk b/buildroot/package/faketime/faketime.mk
similarity index 100%
rename from software/package/faketime/faketime.mk
rename to buildroot/package/faketime/faketime.mk
diff --git a/software/package/fan-ctrl/Config.in b/buildroot/package/fan-ctrl/Config.in
similarity index 100%
rename from software/package/fan-ctrl/Config.in
rename to buildroot/package/fan-ctrl/Config.in
diff --git a/software/package/fan-ctrl/fan-ctrl.hash b/buildroot/package/fan-ctrl/fan-ctrl.hash
similarity index 100%
rename from software/package/fan-ctrl/fan-ctrl.hash
rename to buildroot/package/fan-ctrl/fan-ctrl.hash
diff --git a/software/package/fan-ctrl/fan-ctrl.mk b/buildroot/package/fan-ctrl/fan-ctrl.mk
similarity index 100%
rename from software/package/fan-ctrl/fan-ctrl.mk
rename to buildroot/package/fan-ctrl/fan-ctrl.mk
diff --git a/software/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch b/buildroot/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch
similarity index 100%
rename from software/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch
rename to buildroot/package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch
diff --git a/software/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch b/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch
similarity index 100%
rename from software/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch
rename to buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch
diff --git a/software/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch b/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
similarity index 100%
rename from software/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
rename to buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
diff --git a/software/package/fastd/Config.in b/buildroot/package/fastd/Config.in
similarity index 100%
rename from software/package/fastd/Config.in
rename to buildroot/package/fastd/Config.in
diff --git a/software/package/fastd/fastd.hash b/buildroot/package/fastd/fastd.hash
similarity index 100%
rename from software/package/fastd/fastd.hash
rename to buildroot/package/fastd/fastd.hash
diff --git a/software/package/fastd/fastd.mk b/buildroot/package/fastd/fastd.mk
similarity index 100%
rename from software/package/fastd/fastd.mk
rename to buildroot/package/fastd/fastd.mk
diff --git a/software/package/fatcat/Config.in.host b/buildroot/package/fatcat/Config.in.host
similarity index 100%
rename from software/package/fatcat/Config.in.host
rename to buildroot/package/fatcat/Config.in.host
diff --git a/software/package/fatcat/fatcat.hash b/buildroot/package/fatcat/fatcat.hash
similarity index 100%
rename from software/package/fatcat/fatcat.hash
rename to buildroot/package/fatcat/fatcat.hash
diff --git a/software/package/fatcat/fatcat.mk b/buildroot/package/fatcat/fatcat.mk
similarity index 100%
rename from software/package/fatcat/fatcat.mk
rename to buildroot/package/fatcat/fatcat.mk
diff --git a/software/package/fb-test-app/Config.in b/buildroot/package/fb-test-app/Config.in
similarity index 100%
rename from software/package/fb-test-app/Config.in
rename to buildroot/package/fb-test-app/Config.in
diff --git a/software/package/fb-test-app/fb-test-app.hash b/buildroot/package/fb-test-app/fb-test-app.hash
similarity index 100%
rename from software/package/fb-test-app/fb-test-app.hash
rename to buildroot/package/fb-test-app/fb-test-app.hash
diff --git a/software/package/fb-test-app/fb-test-app.mk b/buildroot/package/fb-test-app/fb-test-app.mk
similarity index 100%
rename from software/package/fb-test-app/fb-test-app.mk
rename to buildroot/package/fb-test-app/fb-test-app.mk
diff --git a/software/package/fbdump/Config.in b/buildroot/package/fbdump/Config.in
similarity index 100%
rename from software/package/fbdump/Config.in
rename to buildroot/package/fbdump/Config.in
diff --git a/software/package/fbdump/fbdump.hash b/buildroot/package/fbdump/fbdump.hash
similarity index 100%
rename from software/package/fbdump/fbdump.hash
rename to buildroot/package/fbdump/fbdump.hash
diff --git a/software/package/fbdump/fbdump.mk b/buildroot/package/fbdump/fbdump.mk
similarity index 100%
rename from software/package/fbdump/fbdump.mk
rename to buildroot/package/fbdump/fbdump.mk
diff --git a/software/package/fbgrab/0001-fix-static-build.patch b/buildroot/package/fbgrab/0001-fix-static-build.patch
similarity index 100%
rename from software/package/fbgrab/0001-fix-static-build.patch
rename to buildroot/package/fbgrab/0001-fix-static-build.patch
diff --git a/software/package/fbgrab/0100-fix-pixfmt-report.patch b/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch
similarity index 100%
rename from software/package/fbgrab/0100-fix-pixfmt-report.patch
rename to buildroot/package/fbgrab/0100-fix-pixfmt-report.patch
diff --git a/software/package/fbgrab/Config.in b/buildroot/package/fbgrab/Config.in
similarity index 100%
rename from software/package/fbgrab/Config.in
rename to buildroot/package/fbgrab/Config.in
diff --git a/software/package/fbgrab/fbgrab.hash b/buildroot/package/fbgrab/fbgrab.hash
similarity index 100%
rename from software/package/fbgrab/fbgrab.hash
rename to buildroot/package/fbgrab/fbgrab.hash
diff --git a/software/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk
similarity index 100%
rename from software/package/fbgrab/fbgrab.mk
rename to buildroot/package/fbgrab/fbgrab.mk
diff --git a/software/package/fbset/0001-Fix-musl-compile.patch b/buildroot/package/fbset/0001-Fix-musl-compile.patch
similarity index 100%
rename from software/package/fbset/0001-Fix-musl-compile.patch
rename to buildroot/package/fbset/0001-Fix-musl-compile.patch
diff --git a/software/package/fbset/Config.in b/buildroot/package/fbset/Config.in
similarity index 100%
rename from software/package/fbset/Config.in
rename to buildroot/package/fbset/Config.in
diff --git a/software/package/fbset/fbset.hash b/buildroot/package/fbset/fbset.hash
similarity index 100%
rename from software/package/fbset/fbset.hash
rename to buildroot/package/fbset/fbset.hash
diff --git a/software/package/fbset/fbset.mk b/buildroot/package/fbset/fbset.mk
similarity index 100%
rename from software/package/fbset/fbset.mk
rename to buildroot/package/fbset/fbset.mk
diff --git a/software/package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch b/buildroot/package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch
similarity index 100%
rename from software/package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch
rename to buildroot/package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch
diff --git a/software/package/fbterm/0002-mouse.cpp-fix-musl-compile.patch b/buildroot/package/fbterm/0002-mouse.cpp-fix-musl-compile.patch
similarity index 100%
rename from software/package/fbterm/0002-mouse.cpp-fix-musl-compile.patch
rename to buildroot/package/fbterm/0002-mouse.cpp-fix-musl-compile.patch
diff --git a/software/package/fbterm/0003-C++11-compliance.patch b/buildroot/package/fbterm/0003-C++11-compliance.patch
similarity index 100%
rename from software/package/fbterm/0003-C++11-compliance.patch
rename to buildroot/package/fbterm/0003-C++11-compliance.patch
diff --git a/software/package/fbterm/0004-iconv.patch b/buildroot/package/fbterm/0004-iconv.patch
similarity index 100%
rename from software/package/fbterm/0004-iconv.patch
rename to buildroot/package/fbterm/0004-iconv.patch
diff --git a/software/package/fbterm/Config.in b/buildroot/package/fbterm/Config.in
similarity index 100%
rename from software/package/fbterm/Config.in
rename to buildroot/package/fbterm/Config.in
diff --git a/software/package/fbterm/fbterm.hash b/buildroot/package/fbterm/fbterm.hash
similarity index 100%
rename from software/package/fbterm/fbterm.hash
rename to buildroot/package/fbterm/fbterm.hash
diff --git a/software/package/fbterm/fbterm.mk b/buildroot/package/fbterm/fbterm.mk
similarity index 100%
rename from software/package/fbterm/fbterm.mk
rename to buildroot/package/fbterm/fbterm.mk
diff --git a/software/package/fbtft/Config.in b/buildroot/package/fbtft/Config.in
similarity index 100%
rename from software/package/fbtft/Config.in
rename to buildroot/package/fbtft/Config.in
diff --git a/software/package/fbtft/fbtft.hash b/buildroot/package/fbtft/fbtft.hash
similarity index 100%
rename from software/package/fbtft/fbtft.hash
rename to buildroot/package/fbtft/fbtft.hash
diff --git a/software/package/fbtft/fbtft.mk b/buildroot/package/fbtft/fbtft.mk
similarity index 100%
rename from software/package/fbtft/fbtft.mk
rename to buildroot/package/fbtft/fbtft.mk
diff --git a/software/package/fbv/0002-cross.patch b/buildroot/package/fbv/0002-cross.patch
similarity index 100%
rename from software/package/fbv/0002-cross.patch
rename to buildroot/package/fbv/0002-cross.patch
diff --git a/software/package/fbv/0003-fix-24bpp-support-on-big-endian.patch b/buildroot/package/fbv/0003-fix-24bpp-support-on-big-endian.patch
similarity index 100%
rename from software/package/fbv/0003-fix-24bpp-support-on-big-endian.patch
rename to buildroot/package/fbv/0003-fix-24bpp-support-on-big-endian.patch
diff --git a/software/package/fbv/0004-fix-bgr555.patch b/buildroot/package/fbv/0004-fix-bgr555.patch
similarity index 100%
rename from software/package/fbv/0004-fix-bgr555.patch
rename to buildroot/package/fbv/0004-fix-bgr555.patch
diff --git a/software/package/fbv/0005-giflib.patch b/buildroot/package/fbv/0005-giflib.patch
similarity index 100%
rename from software/package/fbv/0005-giflib.patch
rename to buildroot/package/fbv/0005-giflib.patch
diff --git a/software/package/fbv/0006-include.patch b/buildroot/package/fbv/0006-include.patch
similarity index 100%
rename from software/package/fbv/0006-include.patch
rename to buildroot/package/fbv/0006-include.patch
diff --git a/software/package/fbv/0007-libpng15.patch b/buildroot/package/fbv/0007-libpng15.patch
similarity index 100%
rename from software/package/fbv/0007-libpng15.patch
rename to buildroot/package/fbv/0007-libpng15.patch
diff --git a/software/package/fbv/Config.in b/buildroot/package/fbv/Config.in
similarity index 100%
rename from software/package/fbv/Config.in
rename to buildroot/package/fbv/Config.in
diff --git a/software/package/fbv/fbv.hash b/buildroot/package/fbv/fbv.hash
similarity index 100%
rename from software/package/fbv/fbv.hash
rename to buildroot/package/fbv/fbv.hash
diff --git a/software/package/fbv/fbv.mk b/buildroot/package/fbv/fbv.mk
similarity index 100%
rename from software/package/fbv/fbv.mk
rename to buildroot/package/fbv/fbv.mk
diff --git a/software/package/fcgiwrap/0001-use-LIBS-from-configure.patch b/buildroot/package/fcgiwrap/0001-use-LIBS-from-configure.patch
similarity index 100%
rename from software/package/fcgiwrap/0001-use-LIBS-from-configure.patch
rename to buildroot/package/fcgiwrap/0001-use-LIBS-from-configure.patch
diff --git a/software/package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch b/buildroot/package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch
similarity index 100%
rename from software/package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch
rename to buildroot/package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch
diff --git a/software/package/fcgiwrap/Config.in b/buildroot/package/fcgiwrap/Config.in
similarity index 100%
rename from software/package/fcgiwrap/Config.in
rename to buildroot/package/fcgiwrap/Config.in
diff --git a/software/package/fcgiwrap/fcgiwrap.hash b/buildroot/package/fcgiwrap/fcgiwrap.hash
similarity index 100%
rename from software/package/fcgiwrap/fcgiwrap.hash
rename to buildroot/package/fcgiwrap/fcgiwrap.hash
diff --git a/software/package/fcgiwrap/fcgiwrap.mk b/buildroot/package/fcgiwrap/fcgiwrap.mk
similarity index 100%
rename from software/package/fcgiwrap/fcgiwrap.mk
rename to buildroot/package/fcgiwrap/fcgiwrap.mk
diff --git a/software/package/fconfig/Config.in b/buildroot/package/fconfig/Config.in
similarity index 100%
rename from software/package/fconfig/Config.in
rename to buildroot/package/fconfig/Config.in
diff --git a/software/package/fconfig/fconfig.hash b/buildroot/package/fconfig/fconfig.hash
similarity index 100%
rename from software/package/fconfig/fconfig.hash
rename to buildroot/package/fconfig/fconfig.hash
diff --git a/software/package/fconfig/fconfig.mk b/buildroot/package/fconfig/fconfig.mk
similarity index 100%
rename from software/package/fconfig/fconfig.mk
rename to buildroot/package/fconfig/fconfig.mk
diff --git a/software/package/fdk-aac/Config.in b/buildroot/package/fdk-aac/Config.in
similarity index 100%
rename from software/package/fdk-aac/Config.in
rename to buildroot/package/fdk-aac/Config.in
diff --git a/software/package/fdk-aac/fdk-aac.hash b/buildroot/package/fdk-aac/fdk-aac.hash
similarity index 100%
rename from software/package/fdk-aac/fdk-aac.hash
rename to buildroot/package/fdk-aac/fdk-aac.hash
diff --git a/software/package/fdk-aac/fdk-aac.mk b/buildroot/package/fdk-aac/fdk-aac.mk
similarity index 100%
rename from software/package/fdk-aac/fdk-aac.mk
rename to buildroot/package/fdk-aac/fdk-aac.mk
diff --git a/software/package/feh/Config.in b/buildroot/package/feh/Config.in
similarity index 100%
rename from software/package/feh/Config.in
rename to buildroot/package/feh/Config.in
diff --git a/software/package/feh/feh.hash b/buildroot/package/feh/feh.hash
similarity index 100%
rename from software/package/feh/feh.hash
rename to buildroot/package/feh/feh.hash
diff --git a/software/package/feh/feh.mk b/buildroot/package/feh/feh.mk
similarity index 100%
rename from software/package/feh/feh.mk
rename to buildroot/package/feh/feh.mk
diff --git a/software/package/fetchmail/Config.in b/buildroot/package/fetchmail/Config.in
similarity index 100%
rename from software/package/fetchmail/Config.in
rename to buildroot/package/fetchmail/Config.in
diff --git a/software/package/fetchmail/fetchmail.hash b/buildroot/package/fetchmail/fetchmail.hash
similarity index 100%
rename from software/package/fetchmail/fetchmail.hash
rename to buildroot/package/fetchmail/fetchmail.hash
diff --git a/software/package/fetchmail/fetchmail.mk b/buildroot/package/fetchmail/fetchmail.mk
similarity index 100%
rename from software/package/fetchmail/fetchmail.mk
rename to buildroot/package/fetchmail/fetchmail.mk
diff --git a/software/package/ffmpeg/Config.in b/buildroot/package/ffmpeg/Config.in
similarity index 100%
rename from software/package/ffmpeg/Config.in
rename to buildroot/package/ffmpeg/Config.in
diff --git a/software/package/ffmpeg/ffmpeg.hash b/buildroot/package/ffmpeg/ffmpeg.hash
similarity index 100%
rename from software/package/ffmpeg/ffmpeg.hash
rename to buildroot/package/ffmpeg/ffmpeg.hash
diff --git a/software/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk
similarity index 100%
rename from software/package/ffmpeg/ffmpeg.mk
rename to buildroot/package/ffmpeg/ffmpeg.mk
diff --git a/software/package/fftw/Config.in b/buildroot/package/fftw/Config.in
similarity index 100%
rename from software/package/fftw/Config.in
rename to buildroot/package/fftw/Config.in
diff --git a/software/package/fftw/fftw-double/Config.in b/buildroot/package/fftw/fftw-double/Config.in
similarity index 100%
rename from software/package/fftw/fftw-double/Config.in
rename to buildroot/package/fftw/fftw-double/Config.in
diff --git a/software/package/fftw/fftw-double/fftw-double.hash b/buildroot/package/fftw/fftw-double/fftw-double.hash
similarity index 100%
rename from software/package/fftw/fftw-double/fftw-double.hash
rename to buildroot/package/fftw/fftw-double/fftw-double.hash
diff --git a/software/package/fftw/fftw-double/fftw-double.mk b/buildroot/package/fftw/fftw-double/fftw-double.mk
similarity index 100%
rename from software/package/fftw/fftw-double/fftw-double.mk
rename to buildroot/package/fftw/fftw-double/fftw-double.mk
diff --git a/software/package/fftw/fftw-long-double/Config.in b/buildroot/package/fftw/fftw-long-double/Config.in
similarity index 100%
rename from software/package/fftw/fftw-long-double/Config.in
rename to buildroot/package/fftw/fftw-long-double/Config.in
diff --git a/software/package/fftw/fftw-long-double/fftw-long-double.hash b/buildroot/package/fftw/fftw-long-double/fftw-long-double.hash
similarity index 100%
rename from software/package/fftw/fftw-long-double/fftw-long-double.hash
rename to buildroot/package/fftw/fftw-long-double/fftw-long-double.hash
diff --git a/software/package/fftw/fftw-long-double/fftw-long-double.mk b/buildroot/package/fftw/fftw-long-double/fftw-long-double.mk
similarity index 100%
rename from software/package/fftw/fftw-long-double/fftw-long-double.mk
rename to buildroot/package/fftw/fftw-long-double/fftw-long-double.mk
diff --git a/software/package/fftw/fftw-quad/Config.in b/buildroot/package/fftw/fftw-quad/Config.in
similarity index 100%
rename from software/package/fftw/fftw-quad/Config.in
rename to buildroot/package/fftw/fftw-quad/Config.in
diff --git a/software/package/fftw/fftw-quad/fftw-quad.hash b/buildroot/package/fftw/fftw-quad/fftw-quad.hash
similarity index 100%
rename from software/package/fftw/fftw-quad/fftw-quad.hash
rename to buildroot/package/fftw/fftw-quad/fftw-quad.hash
diff --git a/software/package/fftw/fftw-quad/fftw-quad.mk b/buildroot/package/fftw/fftw-quad/fftw-quad.mk
similarity index 100%
rename from software/package/fftw/fftw-quad/fftw-quad.mk
rename to buildroot/package/fftw/fftw-quad/fftw-quad.mk
diff --git a/software/package/fftw/fftw-single/Config.in b/buildroot/package/fftw/fftw-single/Config.in
similarity index 100%
rename from software/package/fftw/fftw-single/Config.in
rename to buildroot/package/fftw/fftw-single/Config.in
diff --git a/software/package/fftw/fftw-single/fftw-single.hash b/buildroot/package/fftw/fftw-single/fftw-single.hash
similarity index 100%
rename from software/package/fftw/fftw-single/fftw-single.hash
rename to buildroot/package/fftw/fftw-single/fftw-single.hash
diff --git a/software/package/fftw/fftw-single/fftw-single.mk b/buildroot/package/fftw/fftw-single/fftw-single.mk
similarity index 100%
rename from software/package/fftw/fftw-single/fftw-single.mk
rename to buildroot/package/fftw/fftw-single/fftw-single.mk
diff --git a/software/package/fftw/fftw.hash b/buildroot/package/fftw/fftw.hash
similarity index 100%
rename from software/package/fftw/fftw.hash
rename to buildroot/package/fftw/fftw.hash
diff --git a/software/package/fftw/fftw.mk b/buildroot/package/fftw/fftw.mk
similarity index 100%
rename from software/package/fftw/fftw.mk
rename to buildroot/package/fftw/fftw.mk
diff --git a/software/package/ficl/0001-fix-Makefile.patch b/buildroot/package/ficl/0001-fix-Makefile.patch
similarity index 100%
rename from software/package/ficl/0001-fix-Makefile.patch
rename to buildroot/package/ficl/0001-fix-Makefile.patch
diff --git a/software/package/ficl/Config.in b/buildroot/package/ficl/Config.in
similarity index 100%
rename from software/package/ficl/Config.in
rename to buildroot/package/ficl/Config.in
diff --git a/software/package/ficl/ficl.hash b/buildroot/package/ficl/ficl.hash
similarity index 100%
rename from software/package/ficl/ficl.hash
rename to buildroot/package/ficl/ficl.hash
diff --git a/software/package/ficl/ficl.mk b/buildroot/package/ficl/ficl.mk
similarity index 100%
rename from software/package/ficl/ficl.mk
rename to buildroot/package/ficl/ficl.mk
diff --git a/software/package/file/0001-Add-libmagic.pc.patch b/buildroot/package/file/0001-Add-libmagic.pc.patch
similarity index 100%
rename from software/package/file/0001-Add-libmagic.pc.patch
rename to buildroot/package/file/0001-Add-libmagic.pc.patch
diff --git a/software/package/file/Config.in b/buildroot/package/file/Config.in
similarity index 100%
rename from software/package/file/Config.in
rename to buildroot/package/file/Config.in
diff --git a/software/package/file/file.hash b/buildroot/package/file/file.hash
similarity index 100%
rename from software/package/file/file.hash
rename to buildroot/package/file/file.hash
diff --git a/software/package/file/file.mk b/buildroot/package/file/file.mk
similarity index 100%
rename from software/package/file/file.mk
rename to buildroot/package/file/file.mk
diff --git a/software/package/filemq/Config.in b/buildroot/package/filemq/Config.in
similarity index 100%
rename from software/package/filemq/Config.in
rename to buildroot/package/filemq/Config.in
diff --git a/software/package/filemq/filemq.hash b/buildroot/package/filemq/filemq.hash
similarity index 100%
rename from software/package/filemq/filemq.hash
rename to buildroot/package/filemq/filemq.hash
diff --git a/software/package/filemq/filemq.mk b/buildroot/package/filemq/filemq.mk
similarity index 100%
rename from software/package/filemq/filemq.mk
rename to buildroot/package/filemq/filemq.mk
diff --git a/software/package/findutils/Config.in b/buildroot/package/findutils/Config.in
similarity index 100%
rename from software/package/findutils/Config.in
rename to buildroot/package/findutils/Config.in
diff --git a/software/package/findutils/findutils.hash b/buildroot/package/findutils/findutils.hash
similarity index 100%
rename from software/package/findutils/findutils.hash
rename to buildroot/package/findutils/findutils.hash
diff --git a/software/package/findutils/findutils.mk b/buildroot/package/findutils/findutils.mk
similarity index 100%
rename from software/package/findutils/findutils.mk
rename to buildroot/package/findutils/findutils.mk
diff --git a/software/package/fio/Config.in b/buildroot/package/fio/Config.in
similarity index 100%
rename from software/package/fio/Config.in
rename to buildroot/package/fio/Config.in
diff --git a/software/package/fio/fio.hash b/buildroot/package/fio/fio.hash
similarity index 100%
rename from software/package/fio/fio.hash
rename to buildroot/package/fio/fio.hash
diff --git a/software/package/fio/fio.mk b/buildroot/package/fio/fio.mk
similarity index 100%
rename from software/package/fio/fio.mk
rename to buildroot/package/fio/fio.mk
diff --git a/software/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/buildroot/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch
similarity index 100%
rename from software/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch
rename to buildroot/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch
diff --git a/software/package/flac/Config.in b/buildroot/package/flac/Config.in
similarity index 100%
rename from software/package/flac/Config.in
rename to buildroot/package/flac/Config.in
diff --git a/software/package/flac/flac.hash b/buildroot/package/flac/flac.hash
similarity index 100%
rename from software/package/flac/flac.hash
rename to buildroot/package/flac/flac.hash
diff --git a/software/package/flac/flac.mk b/buildroot/package/flac/flac.mk
similarity index 100%
rename from software/package/flac/flac.mk
rename to buildroot/package/flac/flac.mk
diff --git a/software/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch b/buildroot/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch
similarity index 100%
rename from software/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch
rename to buildroot/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch
diff --git a/software/package/flann/Config.in b/buildroot/package/flann/Config.in
similarity index 100%
rename from software/package/flann/Config.in
rename to buildroot/package/flann/Config.in
diff --git a/software/package/flann/flann.hash b/buildroot/package/flann/flann.hash
similarity index 100%
rename from software/package/flann/flann.hash
rename to buildroot/package/flann/flann.hash
diff --git a/software/package/flann/flann.mk b/buildroot/package/flann/flann.mk
similarity index 100%
rename from software/package/flann/flann.mk
rename to buildroot/package/flann/flann.mk
diff --git a/software/package/flannel/Config.in b/buildroot/package/flannel/Config.in
similarity index 100%
rename from software/package/flannel/Config.in
rename to buildroot/package/flannel/Config.in
diff --git a/software/package/flannel/flannel.hash b/buildroot/package/flannel/flannel.hash
similarity index 100%
rename from software/package/flannel/flannel.hash
rename to buildroot/package/flannel/flannel.hash
diff --git a/software/package/flannel/flannel.mk b/buildroot/package/flannel/flannel.mk
similarity index 100%
rename from software/package/flannel/flannel.mk
rename to buildroot/package/flannel/flannel.mk
diff --git a/software/package/flare-engine/Config.in b/buildroot/package/flare-engine/Config.in
similarity index 100%
rename from software/package/flare-engine/Config.in
rename to buildroot/package/flare-engine/Config.in
diff --git a/software/package/flare-engine/flare-engine.hash b/buildroot/package/flare-engine/flare-engine.hash
similarity index 100%
rename from software/package/flare-engine/flare-engine.hash
rename to buildroot/package/flare-engine/flare-engine.hash
diff --git a/software/package/flare-engine/flare-engine.mk b/buildroot/package/flare-engine/flare-engine.mk
similarity index 100%
rename from software/package/flare-engine/flare-engine.mk
rename to buildroot/package/flare-engine/flare-engine.mk
diff --git a/software/package/flare-game/Config.in b/buildroot/package/flare-game/Config.in
similarity index 100%
rename from software/package/flare-game/Config.in
rename to buildroot/package/flare-game/Config.in
diff --git a/software/package/flare-game/flare-game.hash b/buildroot/package/flare-game/flare-game.hash
similarity index 100%
rename from software/package/flare-game/flare-game.hash
rename to buildroot/package/flare-game/flare-game.hash
diff --git a/software/package/flare-game/flare-game.mk b/buildroot/package/flare-game/flare-game.mk
similarity index 100%
rename from software/package/flare-game/flare-game.mk
rename to buildroot/package/flare-game/flare-game.mk
diff --git a/software/package/flashbench/Config.in b/buildroot/package/flashbench/Config.in
similarity index 100%
rename from software/package/flashbench/Config.in
rename to buildroot/package/flashbench/Config.in
diff --git a/software/package/flashbench/flashbench.hash b/buildroot/package/flashbench/flashbench.hash
similarity index 100%
rename from software/package/flashbench/flashbench.hash
rename to buildroot/package/flashbench/flashbench.hash
diff --git a/software/package/flashbench/flashbench.mk b/buildroot/package/flashbench/flashbench.mk
similarity index 100%
rename from software/package/flashbench/flashbench.mk
rename to buildroot/package/flashbench/flashbench.mk
diff --git a/software/package/flashrom/0001-spi.patch b/buildroot/package/flashrom/0001-spi.patch
similarity index 100%
rename from software/package/flashrom/0001-spi.patch
rename to buildroot/package/flashrom/0001-spi.patch
diff --git a/software/package/flashrom/Config.in b/buildroot/package/flashrom/Config.in
similarity index 100%
rename from software/package/flashrom/Config.in
rename to buildroot/package/flashrom/Config.in
diff --git a/software/package/flashrom/flashrom.hash b/buildroot/package/flashrom/flashrom.hash
similarity index 100%
rename from software/package/flashrom/flashrom.hash
rename to buildroot/package/flashrom/flashrom.hash
diff --git a/software/package/flashrom/flashrom.mk b/buildroot/package/flashrom/flashrom.mk
similarity index 100%
rename from software/package/flashrom/flashrom.mk
rename to buildroot/package/flashrom/flashrom.mk
diff --git a/software/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
similarity index 100%
rename from software/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
rename to buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch
diff --git a/software/package/flatbuffers/Config.in b/buildroot/package/flatbuffers/Config.in
similarity index 100%
rename from software/package/flatbuffers/Config.in
rename to buildroot/package/flatbuffers/Config.in
diff --git a/software/package/flatbuffers/flatbuffers.hash b/buildroot/package/flatbuffers/flatbuffers.hash
similarity index 100%
rename from software/package/flatbuffers/flatbuffers.hash
rename to buildroot/package/flatbuffers/flatbuffers.hash
diff --git a/software/package/flatbuffers/flatbuffers.mk b/buildroot/package/flatbuffers/flatbuffers.mk
similarity index 100%
rename from software/package/flatbuffers/flatbuffers.mk
rename to buildroot/package/flatbuffers/flatbuffers.mk
diff --git a/software/package/flatcc/Config.in b/buildroot/package/flatcc/Config.in
similarity index 100%
rename from software/package/flatcc/Config.in
rename to buildroot/package/flatcc/Config.in
diff --git a/software/package/flatcc/flatcc.hash b/buildroot/package/flatcc/flatcc.hash
similarity index 100%
rename from software/package/flatcc/flatcc.hash
rename to buildroot/package/flatcc/flatcc.hash
diff --git a/software/package/flatcc/flatcc.mk b/buildroot/package/flatcc/flatcc.mk
similarity index 100%
rename from software/package/flatcc/flatcc.mk
rename to buildroot/package/flatcc/flatcc.mk
diff --git a/software/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch b/buildroot/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
similarity index 100%
rename from software/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
rename to buildroot/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
diff --git a/software/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch b/buildroot/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
similarity index 100%
rename from software/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
rename to buildroot/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
diff --git a/software/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch b/buildroot/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
similarity index 100%
rename from software/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
rename to buildroot/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
diff --git a/software/package/flex/Config.in b/buildroot/package/flex/Config.in
similarity index 100%
rename from software/package/flex/Config.in
rename to buildroot/package/flex/Config.in
diff --git a/software/package/flex/flex.hash b/buildroot/package/flex/flex.hash
similarity index 100%
rename from software/package/flex/flex.hash
rename to buildroot/package/flex/flex.hash
diff --git a/software/package/flex/flex.mk b/buildroot/package/flex/flex.mk
similarity index 100%
rename from software/package/flex/flex.mk
rename to buildroot/package/flex/flex.mk
diff --git a/software/package/flickcurl/Config.in b/buildroot/package/flickcurl/Config.in
similarity index 100%
rename from software/package/flickcurl/Config.in
rename to buildroot/package/flickcurl/Config.in
diff --git a/software/package/flickcurl/flickcurl.hash b/buildroot/package/flickcurl/flickcurl.hash
similarity index 100%
rename from software/package/flickcurl/flickcurl.hash
rename to buildroot/package/flickcurl/flickcurl.hash
diff --git a/software/package/flickcurl/flickcurl.mk b/buildroot/package/flickcurl/flickcurl.mk
similarity index 100%
rename from software/package/flickcurl/flickcurl.mk
rename to buildroot/package/flickcurl/flickcurl.mk
diff --git a/software/package/flite/0001-now-honor-DESTDIR-env.-var.patch b/buildroot/package/flite/0001-now-honor-DESTDIR-env.-var.patch
similarity index 100%
rename from software/package/flite/0001-now-honor-DESTDIR-env.-var.patch
rename to buildroot/package/flite/0001-now-honor-DESTDIR-env.-var.patch
diff --git a/software/package/flite/0002-fix-alsa-static.patch b/buildroot/package/flite/0002-fix-alsa-static.patch
similarity index 100%
rename from software/package/flite/0002-fix-alsa-static.patch
rename to buildroot/package/flite/0002-fix-alsa-static.patch
diff --git a/software/package/flite/0003-fix-alsa-version-check.patch b/buildroot/package/flite/0003-fix-alsa-version-check.patch
similarity index 100%
rename from software/package/flite/0003-fix-alsa-version-check.patch
rename to buildroot/package/flite/0003-fix-alsa-version-check.patch
diff --git a/software/package/flite/Config.in b/buildroot/package/flite/Config.in
similarity index 100%
rename from software/package/flite/Config.in
rename to buildroot/package/flite/Config.in
diff --git a/software/package/flite/flite.hash b/buildroot/package/flite/flite.hash
similarity index 100%
rename from software/package/flite/flite.hash
rename to buildroot/package/flite/flite.hash
diff --git a/software/package/flite/flite.mk b/buildroot/package/flite/flite.mk
similarity index 100%
rename from software/package/flite/flite.mk
rename to buildroot/package/flite/flite.mk
diff --git a/software/package/flot/Config.in b/buildroot/package/flot/Config.in
similarity index 100%
rename from software/package/flot/Config.in
rename to buildroot/package/flot/Config.in
diff --git a/software/package/flot/flot.hash b/buildroot/package/flot/flot.hash
similarity index 100%
rename from software/package/flot/flot.hash
rename to buildroot/package/flot/flot.hash
diff --git a/software/package/flot/flot.mk b/buildroot/package/flot/flot.mk
similarity index 100%
rename from software/package/flot/flot.mk
rename to buildroot/package/flot/flot.mk
diff --git a/software/package/fltk/0001-disable-tests.patch b/buildroot/package/fltk/0001-disable-tests.patch
similarity index 100%
rename from software/package/fltk/0001-disable-tests.patch
rename to buildroot/package/fltk/0001-disable-tests.patch
diff --git a/software/package/fltk/Config.in b/buildroot/package/fltk/Config.in
similarity index 100%
rename from software/package/fltk/Config.in
rename to buildroot/package/fltk/Config.in
diff --git a/software/package/fltk/fltk.hash b/buildroot/package/fltk/fltk.hash
similarity index 100%
rename from software/package/fltk/fltk.hash
rename to buildroot/package/fltk/fltk.hash
diff --git a/software/package/fltk/fltk.mk b/buildroot/package/fltk/fltk.mk
similarity index 100%
rename from software/package/fltk/fltk.mk
rename to buildroot/package/fltk/fltk.mk
diff --git a/software/package/fluid-soundfont/Config.in b/buildroot/package/fluid-soundfont/Config.in
similarity index 100%
rename from software/package/fluid-soundfont/Config.in
rename to buildroot/package/fluid-soundfont/Config.in
diff --git a/software/package/fluid-soundfont/fluid-soundfont.hash b/buildroot/package/fluid-soundfont/fluid-soundfont.hash
similarity index 100%
rename from software/package/fluid-soundfont/fluid-soundfont.hash
rename to buildroot/package/fluid-soundfont/fluid-soundfont.hash
diff --git a/software/package/fluid-soundfont/fluid-soundfont.mk b/buildroot/package/fluid-soundfont/fluid-soundfont.mk
similarity index 100%
rename from software/package/fluid-soundfont/fluid-soundfont.mk
rename to buildroot/package/fluid-soundfont/fluid-soundfont.mk
diff --git a/software/package/fluidsynth/Config.in b/buildroot/package/fluidsynth/Config.in
similarity index 100%
rename from software/package/fluidsynth/Config.in
rename to buildroot/package/fluidsynth/Config.in
diff --git a/software/package/fluidsynth/fluidsynth.hash b/buildroot/package/fluidsynth/fluidsynth.hash
similarity index 100%
rename from software/package/fluidsynth/fluidsynth.hash
rename to buildroot/package/fluidsynth/fluidsynth.hash
diff --git a/software/package/fluidsynth/fluidsynth.mk b/buildroot/package/fluidsynth/fluidsynth.mk
similarity index 100%
rename from software/package/fluidsynth/fluidsynth.mk
rename to buildroot/package/fluidsynth/fluidsynth.mk
diff --git a/software/package/fluxbox/Config.in b/buildroot/package/fluxbox/Config.in
similarity index 100%
rename from software/package/fluxbox/Config.in
rename to buildroot/package/fluxbox/Config.in
diff --git a/software/package/fluxbox/fluxbox.hash b/buildroot/package/fluxbox/fluxbox.hash
similarity index 100%
rename from software/package/fluxbox/fluxbox.hash
rename to buildroot/package/fluxbox/fluxbox.hash
diff --git a/software/package/fluxbox/fluxbox.mk b/buildroot/package/fluxbox/fluxbox.mk
similarity index 100%
rename from software/package/fluxbox/fluxbox.mk
rename to buildroot/package/fluxbox/fluxbox.mk
diff --git a/software/package/fluxbox/xsession b/buildroot/package/fluxbox/xsession
similarity index 100%
rename from software/package/fluxbox/xsession
rename to buildroot/package/fluxbox/xsession
diff --git a/software/package/fmc/Config.in b/buildroot/package/fmc/Config.in
similarity index 100%
rename from software/package/fmc/Config.in
rename to buildroot/package/fmc/Config.in
diff --git a/software/package/fmc/fmc.hash b/buildroot/package/fmc/fmc.hash
similarity index 100%
rename from software/package/fmc/fmc.hash
rename to buildroot/package/fmc/fmc.hash
diff --git a/software/package/fmc/fmc.mk b/buildroot/package/fmc/fmc.mk
similarity index 100%
rename from software/package/fmc/fmc.mk
rename to buildroot/package/fmc/fmc.mk
diff --git a/software/package/fmlib/Config.in b/buildroot/package/fmlib/Config.in
similarity index 100%
rename from software/package/fmlib/Config.in
rename to buildroot/package/fmlib/Config.in
diff --git a/software/package/fmlib/fmlib.hash b/buildroot/package/fmlib/fmlib.hash
similarity index 100%
rename from software/package/fmlib/fmlib.hash
rename to buildroot/package/fmlib/fmlib.hash
diff --git a/software/package/fmlib/fmlib.mk b/buildroot/package/fmlib/fmlib.mk
similarity index 100%
rename from software/package/fmlib/fmlib.mk
rename to buildroot/package/fmlib/fmlib.mk
diff --git a/software/package/fmt/Config.in b/buildroot/package/fmt/Config.in
similarity index 100%
rename from software/package/fmt/Config.in
rename to buildroot/package/fmt/Config.in
diff --git a/software/package/fmt/fmt.hash b/buildroot/package/fmt/fmt.hash
similarity index 100%
rename from software/package/fmt/fmt.hash
rename to buildroot/package/fmt/fmt.hash
diff --git a/software/package/fmt/fmt.mk b/buildroot/package/fmt/fmt.mk
similarity index 100%
rename from software/package/fmt/fmt.mk
rename to buildroot/package/fmt/fmt.mk
diff --git a/software/package/fmtools/Config.in b/buildroot/package/fmtools/Config.in
similarity index 100%
rename from software/package/fmtools/Config.in
rename to buildroot/package/fmtools/Config.in
diff --git a/software/package/fmtools/fmtools.hash b/buildroot/package/fmtools/fmtools.hash
similarity index 100%
rename from software/package/fmtools/fmtools.hash
rename to buildroot/package/fmtools/fmtools.hash
diff --git a/software/package/fmtools/fmtools.mk b/buildroot/package/fmtools/fmtools.mk
similarity index 100%
rename from software/package/fmtools/fmtools.mk
rename to buildroot/package/fmtools/fmtools.mk
diff --git a/software/package/font-awesome/Config.in b/buildroot/package/font-awesome/Config.in
similarity index 100%
rename from software/package/font-awesome/Config.in
rename to buildroot/package/font-awesome/Config.in
diff --git a/software/package/font-awesome/font-awesome.hash b/buildroot/package/font-awesome/font-awesome.hash
similarity index 100%
rename from software/package/font-awesome/font-awesome.hash
rename to buildroot/package/font-awesome/font-awesome.hash
diff --git a/software/package/font-awesome/font-awesome.mk b/buildroot/package/font-awesome/font-awesome.mk
similarity index 100%
rename from software/package/font-awesome/font-awesome.mk
rename to buildroot/package/font-awesome/font-awesome.mk
diff --git a/software/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch b/buildroot/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
similarity index 100%
rename from software/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
rename to buildroot/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
diff --git a/software/package/fontconfig/Config.in b/buildroot/package/fontconfig/Config.in
similarity index 100%
rename from software/package/fontconfig/Config.in
rename to buildroot/package/fontconfig/Config.in
diff --git a/software/package/fontconfig/fontconfig.hash b/buildroot/package/fontconfig/fontconfig.hash
similarity index 100%
rename from software/package/fontconfig/fontconfig.hash
rename to buildroot/package/fontconfig/fontconfig.hash
diff --git a/software/package/fontconfig/fontconfig.mk b/buildroot/package/fontconfig/fontconfig.mk
similarity index 100%
rename from software/package/fontconfig/fontconfig.mk
rename to buildroot/package/fontconfig/fontconfig.mk
diff --git a/software/package/fping/Config.in b/buildroot/package/fping/Config.in
similarity index 100%
rename from software/package/fping/Config.in
rename to buildroot/package/fping/Config.in
diff --git a/software/package/fping/fping.hash b/buildroot/package/fping/fping.hash
similarity index 100%
rename from software/package/fping/fping.hash
rename to buildroot/package/fping/fping.hash
diff --git a/software/package/fping/fping.mk b/buildroot/package/fping/fping.mk
similarity index 100%
rename from software/package/fping/fping.mk
rename to buildroot/package/fping/fping.mk
diff --git a/software/package/freeradius-client/0001-fix-for-nettle.patch b/buildroot/package/freeradius-client/0001-fix-for-nettle.patch
similarity index 100%
rename from software/package/freeradius-client/0001-fix-for-nettle.patch
rename to buildroot/package/freeradius-client/0001-fix-for-nettle.patch
diff --git a/software/package/freeradius-client/Config.in b/buildroot/package/freeradius-client/Config.in
similarity index 100%
rename from software/package/freeradius-client/Config.in
rename to buildroot/package/freeradius-client/Config.in
diff --git a/software/package/freeradius-client/freeradius-client.hash b/buildroot/package/freeradius-client/freeradius-client.hash
similarity index 100%
rename from software/package/freeradius-client/freeradius-client.hash
rename to buildroot/package/freeradius-client/freeradius-client.hash
diff --git a/software/package/freeradius-client/freeradius-client.mk b/buildroot/package/freeradius-client/freeradius-client.mk
similarity index 100%
rename from software/package/freeradius-client/freeradius-client.mk
rename to buildroot/package/freeradius-client/freeradius-client.mk
diff --git a/software/package/freerdp/Config.in b/buildroot/package/freerdp/Config.in
similarity index 100%
rename from software/package/freerdp/Config.in
rename to buildroot/package/freerdp/Config.in
diff --git a/software/package/freerdp/freerdp.hash b/buildroot/package/freerdp/freerdp.hash
similarity index 100%
rename from software/package/freerdp/freerdp.hash
rename to buildroot/package/freerdp/freerdp.hash
diff --git a/software/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk
similarity index 100%
rename from software/package/freerdp/freerdp.mk
rename to buildroot/package/freerdp/freerdp.mk
diff --git a/software/package/freescale-imx/Config.in b/buildroot/package/freescale-imx/Config.in
similarity index 100%
rename from software/package/freescale-imx/Config.in
rename to buildroot/package/freescale-imx/Config.in
diff --git a/software/package/freescale-imx/firmware-imx/Config.in b/buildroot/package/freescale-imx/firmware-imx/Config.in
similarity index 100%
rename from software/package/freescale-imx/firmware-imx/Config.in
rename to buildroot/package/freescale-imx/firmware-imx/Config.in
diff --git a/software/package/freescale-imx/firmware-imx/firmware-imx.hash b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
similarity index 100%
rename from software/package/freescale-imx/firmware-imx/firmware-imx.hash
rename to buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
diff --git a/software/package/freescale-imx/firmware-imx/firmware-imx.mk b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
similarity index 100%
rename from software/package/freescale-imx/firmware-imx/firmware-imx.mk
rename to buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
diff --git a/software/package/freescale-imx/freescale-imx.mk b/buildroot/package/freescale-imx/freescale-imx.mk
similarity index 100%
rename from software/package/freescale-imx/freescale-imx.mk
rename to buildroot/package/freescale-imx/freescale-imx.mk
diff --git a/software/package/freescale-imx/gpu-amd-bin-mx51/Config.in b/buildroot/package/freescale-imx/gpu-amd-bin-mx51/Config.in
similarity index 100%
rename from software/package/freescale-imx/gpu-amd-bin-mx51/Config.in
rename to buildroot/package/freescale-imx/gpu-amd-bin-mx51/Config.in
diff --git a/software/package/freescale-imx/gpu-amd-bin-mx51/egl.pc b/buildroot/package/freescale-imx/gpu-amd-bin-mx51/egl.pc
similarity index 100%
rename from software/package/freescale-imx/gpu-amd-bin-mx51/egl.pc
rename to buildroot/package/freescale-imx/gpu-amd-bin-mx51/egl.pc
diff --git a/software/package/freescale-imx/gpu-amd-bin-mx51/glesv2.pc b/buildroot/package/freescale-imx/gpu-amd-bin-mx51/glesv2.pc
similarity index 100%
rename from software/package/freescale-imx/gpu-amd-bin-mx51/glesv2.pc
rename to buildroot/package/freescale-imx/gpu-amd-bin-mx51/glesv2.pc
diff --git a/software/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash b/buildroot/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash
similarity index 100%
rename from software/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash
rename to buildroot/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash
diff --git a/software/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/buildroot/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
similarity index 100%
rename from software/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
rename to buildroot/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
diff --git a/software/package/freescale-imx/gpu-amd-bin-mx51/vg.pc b/buildroot/package/freescale-imx/gpu-amd-bin-mx51/vg.pc
similarity index 100%
rename from software/package/freescale-imx/gpu-amd-bin-mx51/vg.pc
rename to buildroot/package/freescale-imx/gpu-amd-bin-mx51/vg.pc
diff --git a/software/package/freescale-imx/imx-alsa-plugins/Config.in b/buildroot/package/freescale-imx/imx-alsa-plugins/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-alsa-plugins/Config.in
rename to buildroot/package/freescale-imx/imx-alsa-plugins/Config.in
diff --git a/software/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash
similarity index 100%
rename from software/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash
rename to buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash
diff --git a/software/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk b/buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk
similarity index 100%
rename from software/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk
rename to buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk
diff --git a/software/package/freescale-imx/imx-codec/Config.in b/buildroot/package/freescale-imx/imx-codec/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-codec/Config.in
rename to buildroot/package/freescale-imx/imx-codec/Config.in
diff --git a/software/package/freescale-imx/imx-codec/imx-codec.hash b/buildroot/package/freescale-imx/imx-codec/imx-codec.hash
similarity index 100%
rename from software/package/freescale-imx/imx-codec/imx-codec.hash
rename to buildroot/package/freescale-imx/imx-codec/imx-codec.hash
diff --git a/software/package/freescale-imx/imx-codec/imx-codec.mk b/buildroot/package/freescale-imx/imx-codec/imx-codec.mk
similarity index 100%
rename from software/package/freescale-imx/imx-codec/imx-codec.mk
rename to buildroot/package/freescale-imx/imx-codec/imx-codec.mk
diff --git a/software/package/freescale-imx/imx-gpu-g2d/Config.in b/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-gpu-g2d/Config.in
rename to buildroot/package/freescale-imx/imx-gpu-g2d/Config.in
diff --git a/software/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
similarity index 100%
rename from software/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
rename to buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
diff --git a/software/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
similarity index 100%
rename from software/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
rename to buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
diff --git a/software/package/freescale-imx/imx-gpu-viv/Config.in b/buildroot/package/freescale-imx/imx-gpu-viv/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-gpu-viv/Config.in
rename to buildroot/package/freescale-imx/imx-gpu-viv/Config.in
diff --git a/software/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
similarity index 100%
rename from software/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
rename to buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
diff --git a/software/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
similarity index 100%
rename from software/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rename to buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
diff --git a/software/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/buildroot/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
similarity index 100%
rename from software/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
rename to buildroot/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
diff --git a/software/package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch b/buildroot/package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch
similarity index 100%
rename from software/package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch
rename to buildroot/package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch
diff --git a/software/package/freescale-imx/imx-kobs/Config.in b/buildroot/package/freescale-imx/imx-kobs/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-kobs/Config.in
rename to buildroot/package/freescale-imx/imx-kobs/Config.in
diff --git a/software/package/freescale-imx/imx-kobs/imx-kobs.hash b/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash
similarity index 100%
rename from software/package/freescale-imx/imx-kobs/imx-kobs.hash
rename to buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash
diff --git a/software/package/freescale-imx/imx-kobs/imx-kobs.mk b/buildroot/package/freescale-imx/imx-kobs/imx-kobs.mk
similarity index 100%
rename from software/package/freescale-imx/imx-kobs/imx-kobs.mk
rename to buildroot/package/freescale-imx/imx-kobs/imx-kobs.mk
diff --git a/software/package/freescale-imx/imx-lib/Config.in b/buildroot/package/freescale-imx/imx-lib/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-lib/Config.in
rename to buildroot/package/freescale-imx/imx-lib/Config.in
diff --git a/software/package/freescale-imx/imx-lib/imx-lib.hash b/buildroot/package/freescale-imx/imx-lib/imx-lib.hash
similarity index 100%
rename from software/package/freescale-imx/imx-lib/imx-lib.hash
rename to buildroot/package/freescale-imx/imx-lib/imx-lib.hash
diff --git a/software/package/freescale-imx/imx-lib/imx-lib.mk b/buildroot/package/freescale-imx/imx-lib/imx-lib.mk
similarity index 100%
rename from software/package/freescale-imx/imx-lib/imx-lib.mk
rename to buildroot/package/freescale-imx/imx-lib/imx-lib.mk
diff --git a/software/package/freescale-imx/imx-m4fwloader/Config.in b/buildroot/package/freescale-imx/imx-m4fwloader/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-m4fwloader/Config.in
rename to buildroot/package/freescale-imx/imx-m4fwloader/Config.in
diff --git a/software/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash b/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash
similarity index 100%
rename from software/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash
rename to buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash
diff --git a/software/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
similarity index 100%
rename from software/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
rename to buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
diff --git a/software/package/freescale-imx/imx-parser/Config.in b/buildroot/package/freescale-imx/imx-parser/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-parser/Config.in
rename to buildroot/package/freescale-imx/imx-parser/Config.in
diff --git a/software/package/freescale-imx/imx-parser/imx-parser.hash b/buildroot/package/freescale-imx/imx-parser/imx-parser.hash
similarity index 100%
rename from software/package/freescale-imx/imx-parser/imx-parser.hash
rename to buildroot/package/freescale-imx/imx-parser/imx-parser.hash
diff --git a/software/package/freescale-imx/imx-parser/imx-parser.mk b/buildroot/package/freescale-imx/imx-parser/imx-parser.mk
similarity index 100%
rename from software/package/freescale-imx/imx-parser/imx-parser.mk
rename to buildroot/package/freescale-imx/imx-parser/imx-parser.mk
diff --git a/software/package/freescale-imx/imx-sc-firmware/Config.in b/buildroot/package/freescale-imx/imx-sc-firmware/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-sc-firmware/Config.in
rename to buildroot/package/freescale-imx/imx-sc-firmware/Config.in
diff --git a/software/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
similarity index 100%
rename from software/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
rename to buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
diff --git a/software/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
similarity index 100%
rename from software/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
rename to buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
diff --git a/software/package/freescale-imx/imx-uuc/Config.in b/buildroot/package/freescale-imx/imx-uuc/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-uuc/Config.in
rename to buildroot/package/freescale-imx/imx-uuc/Config.in
diff --git a/software/package/freescale-imx/imx-uuc/S80imx-uuc b/buildroot/package/freescale-imx/imx-uuc/S80imx-uuc
similarity index 100%
rename from software/package/freescale-imx/imx-uuc/S80imx-uuc
rename to buildroot/package/freescale-imx/imx-uuc/S80imx-uuc
diff --git a/software/package/freescale-imx/imx-uuc/imx-uuc.hash b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash
similarity index 100%
rename from software/package/freescale-imx/imx-uuc/imx-uuc.hash
rename to buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash
diff --git a/software/package/freescale-imx/imx-uuc/imx-uuc.mk b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk
similarity index 100%
rename from software/package/freescale-imx/imx-uuc/imx-uuc.mk
rename to buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk
diff --git a/software/package/freescale-imx/imx-uuc/imx-uuc.service b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.service
similarity index 100%
rename from software/package/freescale-imx/imx-uuc/imx-uuc.service
rename to buildroot/package/freescale-imx/imx-uuc/imx-uuc.service
diff --git a/software/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
similarity index 100%
rename from software/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
rename to buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
diff --git a/software/package/freescale-imx/imx-vpu-hantro/Config.in b/buildroot/package/freescale-imx/imx-vpu-hantro/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-vpu-hantro/Config.in
rename to buildroot/package/freescale-imx/imx-vpu-hantro/Config.in
diff --git a/software/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
similarity index 100%
rename from software/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
rename to buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
diff --git a/software/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
similarity index 100%
rename from software/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
rename to buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
diff --git a/software/package/freescale-imx/imx-vpu/Config.in b/buildroot/package/freescale-imx/imx-vpu/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-vpu/Config.in
rename to buildroot/package/freescale-imx/imx-vpu/Config.in
diff --git a/software/package/freescale-imx/imx-vpu/imx-vpu.hash b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
similarity index 100%
rename from software/package/freescale-imx/imx-vpu/imx-vpu.hash
rename to buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
diff --git a/software/package/freescale-imx/imx-vpu/imx-vpu.mk b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk
similarity index 100%
rename from software/package/freescale-imx/imx-vpu/imx-vpu.mk
rename to buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk
diff --git a/software/package/freescale-imx/imx-vpuwrap/Config.in b/buildroot/package/freescale-imx/imx-vpuwrap/Config.in
similarity index 100%
rename from software/package/freescale-imx/imx-vpuwrap/Config.in
rename to buildroot/package/freescale-imx/imx-vpuwrap/Config.in
diff --git a/software/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash b/buildroot/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash
similarity index 100%
rename from software/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash
rename to buildroot/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash
diff --git a/software/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/buildroot/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
similarity index 100%
rename from software/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
rename to buildroot/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
diff --git a/software/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
similarity index 100%
rename from software/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
rename to buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
diff --git a/software/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
similarity index 100%
rename from software/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
rename to buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
diff --git a/software/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
similarity index 100%
rename from software/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
rename to buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
diff --git a/software/package/freescale-imx/libz160/Config.in b/buildroot/package/freescale-imx/libz160/Config.in
similarity index 100%
rename from software/package/freescale-imx/libz160/Config.in
rename to buildroot/package/freescale-imx/libz160/Config.in
diff --git a/software/package/freescale-imx/libz160/libz160.hash b/buildroot/package/freescale-imx/libz160/libz160.hash
similarity index 100%
rename from software/package/freescale-imx/libz160/libz160.hash
rename to buildroot/package/freescale-imx/libz160/libz160.hash
diff --git a/software/package/freescale-imx/libz160/libz160.mk b/buildroot/package/freescale-imx/libz160/libz160.mk
similarity index 100%
rename from software/package/freescale-imx/libz160/libz160.mk
rename to buildroot/package/freescale-imx/libz160/libz160.mk
diff --git a/software/package/freeswitch-mod-bcg729/Config.in b/buildroot/package/freeswitch-mod-bcg729/Config.in
similarity index 100%
rename from software/package/freeswitch-mod-bcg729/Config.in
rename to buildroot/package/freeswitch-mod-bcg729/Config.in
diff --git a/software/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash
similarity index 100%
rename from software/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash
rename to buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash
diff --git a/software/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk
similarity index 100%
rename from software/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk
rename to buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk
diff --git a/software/package/freeswitch/Config.in b/buildroot/package/freeswitch/Config.in
similarity index 100%
rename from software/package/freeswitch/Config.in
rename to buildroot/package/freeswitch/Config.in
diff --git a/software/package/freeswitch/freeswitch.hash b/buildroot/package/freeswitch/freeswitch.hash
similarity index 100%
rename from software/package/freeswitch/freeswitch.hash
rename to buildroot/package/freeswitch/freeswitch.hash
diff --git a/software/package/freeswitch/freeswitch.mk b/buildroot/package/freeswitch/freeswitch.mk
similarity index 100%
rename from software/package/freeswitch/freeswitch.mk
rename to buildroot/package/freeswitch/freeswitch.mk
diff --git a/software/package/freetype/Config.in b/buildroot/package/freetype/Config.in
similarity index 100%
rename from software/package/freetype/Config.in
rename to buildroot/package/freetype/Config.in
diff --git a/software/package/freetype/freetype.hash b/buildroot/package/freetype/freetype.hash
similarity index 100%
rename from software/package/freetype/freetype.hash
rename to buildroot/package/freetype/freetype.hash
diff --git a/software/package/freetype/freetype.mk b/buildroot/package/freetype/freetype.mk
similarity index 100%
rename from software/package/freetype/freetype.mk
rename to buildroot/package/freetype/freetype.mk
diff --git a/software/package/fscryptctl/Config.in b/buildroot/package/fscryptctl/Config.in
similarity index 100%
rename from software/package/fscryptctl/Config.in
rename to buildroot/package/fscryptctl/Config.in
diff --git a/software/package/fscryptctl/fscryptctl.hash b/buildroot/package/fscryptctl/fscryptctl.hash
similarity index 100%
rename from software/package/fscryptctl/fscryptctl.hash
rename to buildroot/package/fscryptctl/fscryptctl.hash
diff --git a/software/package/fscryptctl/fscryptctl.mk b/buildroot/package/fscryptctl/fscryptctl.mk
similarity index 100%
rename from software/package/fscryptctl/fscryptctl.mk
rename to buildroot/package/fscryptctl/fscryptctl.mk
diff --git a/software/package/fstrcmp/0001-disable-rpath.patch b/buildroot/package/fstrcmp/0001-disable-rpath.patch
similarity index 100%
rename from software/package/fstrcmp/0001-disable-rpath.patch
rename to buildroot/package/fstrcmp/0001-disable-rpath.patch
diff --git a/software/package/fstrcmp/Config.in b/buildroot/package/fstrcmp/Config.in
similarity index 100%
rename from software/package/fstrcmp/Config.in
rename to buildroot/package/fstrcmp/Config.in
diff --git a/software/package/fstrcmp/fstrcmp.hash b/buildroot/package/fstrcmp/fstrcmp.hash
similarity index 100%
rename from software/package/fstrcmp/fstrcmp.hash
rename to buildroot/package/fstrcmp/fstrcmp.hash
diff --git a/software/package/fstrcmp/fstrcmp.mk b/buildroot/package/fstrcmp/fstrcmp.mk
similarity index 100%
rename from software/package/fstrcmp/fstrcmp.mk
rename to buildroot/package/fstrcmp/fstrcmp.mk
diff --git a/software/package/fswebcam/Config.in b/buildroot/package/fswebcam/Config.in
similarity index 100%
rename from software/package/fswebcam/Config.in
rename to buildroot/package/fswebcam/Config.in
diff --git a/software/package/fswebcam/fswebcam.hash b/buildroot/package/fswebcam/fswebcam.hash
similarity index 100%
rename from software/package/fswebcam/fswebcam.hash
rename to buildroot/package/fswebcam/fswebcam.hash
diff --git a/software/package/fswebcam/fswebcam.mk b/buildroot/package/fswebcam/fswebcam.mk
similarity index 100%
rename from software/package/fswebcam/fswebcam.mk
rename to buildroot/package/fswebcam/fswebcam.mk
diff --git a/software/package/ftop/0001-overflow.patch b/buildroot/package/ftop/0001-overflow.patch
similarity index 100%
rename from software/package/ftop/0001-overflow.patch
rename to buildroot/package/ftop/0001-overflow.patch
diff --git a/software/package/ftop/Config.in b/buildroot/package/ftop/Config.in
similarity index 100%
rename from software/package/ftop/Config.in
rename to buildroot/package/ftop/Config.in
diff --git a/software/package/ftop/ftop.hash b/buildroot/package/ftop/ftop.hash
similarity index 100%
rename from software/package/ftop/ftop.hash
rename to buildroot/package/ftop/ftop.hash
diff --git a/software/package/ftop/ftop.mk b/buildroot/package/ftop/ftop.mk
similarity index 100%
rename from software/package/ftop/ftop.mk
rename to buildroot/package/ftop/ftop.mk
diff --git a/software/package/fwts/0001-build-do-not-use-Werror.patch b/buildroot/package/fwts/0001-build-do-not-use-Werror.patch
similarity index 100%
rename from software/package/fwts/0001-build-do-not-use-Werror.patch
rename to buildroot/package/fwts/0001-build-do-not-use-Werror.patch
diff --git a/software/package/fwts/Config.in b/buildroot/package/fwts/Config.in
similarity index 100%
rename from software/package/fwts/Config.in
rename to buildroot/package/fwts/Config.in
diff --git a/software/package/fwts/fwts.hash b/buildroot/package/fwts/fwts.hash
similarity index 100%
rename from software/package/fwts/fwts.hash
rename to buildroot/package/fwts/fwts.hash
diff --git a/software/package/fwts/fwts.mk b/buildroot/package/fwts/fwts.mk
similarity index 100%
rename from software/package/fwts/fwts.mk
rename to buildroot/package/fwts/fwts.mk
diff --git a/software/package/fwup/Config.in b/buildroot/package/fwup/Config.in
similarity index 100%
rename from software/package/fwup/Config.in
rename to buildroot/package/fwup/Config.in
diff --git a/software/package/fwup/Config.in.host b/buildroot/package/fwup/Config.in.host
similarity index 100%
rename from software/package/fwup/Config.in.host
rename to buildroot/package/fwup/Config.in.host
diff --git a/software/package/fwup/fwup.hash b/buildroot/package/fwup/fwup.hash
similarity index 100%
rename from software/package/fwup/fwup.hash
rename to buildroot/package/fwup/fwup.hash
diff --git a/software/package/fwup/fwup.mk b/buildroot/package/fwup/fwup.mk
similarity index 100%
rename from software/package/fwup/fwup.mk
rename to buildroot/package/fwup/fwup.mk
diff --git a/software/package/fxload/Config.in b/buildroot/package/fxload/Config.in
similarity index 100%
rename from software/package/fxload/Config.in
rename to buildroot/package/fxload/Config.in
diff --git a/software/package/fxload/fxload.hash b/buildroot/package/fxload/fxload.hash
similarity index 100%
rename from software/package/fxload/fxload.hash
rename to buildroot/package/fxload/fxload.hash
diff --git a/software/package/fxload/fxload.mk b/buildroot/package/fxload/fxload.mk
similarity index 100%
rename from software/package/fxload/fxload.mk
rename to buildroot/package/fxload/fxload.mk
diff --git a/software/package/gamin/0001-no-abstract-sockets.patch b/buildroot/package/gamin/0001-no-abstract-sockets.patch
similarity index 100%
rename from software/package/gamin/0001-no-abstract-sockets.patch
rename to buildroot/package/gamin/0001-no-abstract-sockets.patch
diff --git a/software/package/gamin/0002-no-const-return.patch b/buildroot/package/gamin/0002-no-const-return.patch
similarity index 100%
rename from software/package/gamin/0002-no-const-return.patch
rename to buildroot/package/gamin/0002-no-const-return.patch
diff --git a/software/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch b/buildroot/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
similarity index 100%
rename from software/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
rename to buildroot/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch
diff --git a/software/package/gamin/Config.in b/buildroot/package/gamin/Config.in
similarity index 100%
rename from software/package/gamin/Config.in
rename to buildroot/package/gamin/Config.in
diff --git a/software/package/gamin/gamin.hash b/buildroot/package/gamin/gamin.hash
similarity index 100%
rename from software/package/gamin/gamin.hash
rename to buildroot/package/gamin/gamin.hash
diff --git a/software/package/gamin/gamin.mk b/buildroot/package/gamin/gamin.mk
similarity index 100%
rename from software/package/gamin/gamin.mk
rename to buildroot/package/gamin/gamin.mk
diff --git a/software/package/gauche/0001-fix-so-suffix.patch b/buildroot/package/gauche/0001-fix-so-suffix.patch
similarity index 100%
rename from software/package/gauche/0001-fix-so-suffix.patch
rename to buildroot/package/gauche/0001-fix-so-suffix.patch
diff --git a/software/package/gauche/Config.in b/buildroot/package/gauche/Config.in
similarity index 100%
rename from software/package/gauche/Config.in
rename to buildroot/package/gauche/Config.in
diff --git a/software/package/gauche/gauche.hash b/buildroot/package/gauche/gauche.hash
similarity index 100%
rename from software/package/gauche/gauche.hash
rename to buildroot/package/gauche/gauche.hash
diff --git a/software/package/gauche/gauche.mk b/buildroot/package/gauche/gauche.mk
similarity index 100%
rename from software/package/gauche/gauche.mk
rename to buildroot/package/gauche/gauche.mk
diff --git a/software/package/gawk/0001-no-versioned.patch b/buildroot/package/gawk/0001-no-versioned.patch
similarity index 100%
rename from software/package/gawk/0001-no-versioned.patch
rename to buildroot/package/gawk/0001-no-versioned.patch
diff --git a/software/package/gawk/Config.in b/buildroot/package/gawk/Config.in
similarity index 100%
rename from software/package/gawk/Config.in
rename to buildroot/package/gawk/Config.in
diff --git a/software/package/gawk/gawk.hash b/buildroot/package/gawk/gawk.hash
similarity index 100%
rename from software/package/gawk/gawk.hash
rename to buildroot/package/gawk/gawk.hash
diff --git a/software/package/gawk/gawk.mk b/buildroot/package/gawk/gawk.mk
similarity index 100%
rename from software/package/gawk/gawk.mk
rename to buildroot/package/gawk/gawk.mk
diff --git a/software/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch b/buildroot/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch
similarity index 100%
rename from software/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch
rename to buildroot/package/gcc/5.5.0/0001-m68k-coldfire-pr68467.patch
diff --git a/software/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch b/buildroot/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch
similarity index 100%
rename from software/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch
rename to buildroot/package/gcc/5.5.0/0002-libsanitizer-Use-pre-computed-size.patch
diff --git a/software/package/gcc/5.5.0/100-uclibc-conf.patch b/buildroot/package/gcc/5.5.0/100-uclibc-conf.patch
similarity index 100%
rename from software/package/gcc/5.5.0/100-uclibc-conf.patch
rename to buildroot/package/gcc/5.5.0/100-uclibc-conf.patch
diff --git a/software/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
similarity index 100%
rename from software/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
rename to buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
diff --git a/software/package/gcc/5.5.0/301-missing-execinfo_h.patch b/buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch
similarity index 100%
rename from software/package/gcc/5.5.0/301-missing-execinfo_h.patch
rename to buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch
diff --git a/software/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from software/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch
rename to buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch
diff --git a/software/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch b/buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from software/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch
rename to buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch
diff --git a/software/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
similarity index 100%
rename from software/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
rename to buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
diff --git a/software/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch b/buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
rename to buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
diff --git a/software/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch b/buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
similarity index 100%
rename from software/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
rename to buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
diff --git a/software/package/gcc/5.5.0/860-cilk-wchar.patch b/buildroot/package/gcc/5.5.0/860-cilk-wchar.patch
similarity index 100%
rename from software/package/gcc/5.5.0/860-cilk-wchar.patch
rename to buildroot/package/gcc/5.5.0/860-cilk-wchar.patch
diff --git a/software/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch b/buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
similarity index 100%
rename from software/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
rename to buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
diff --git a/software/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch b/buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
similarity index 100%
rename from software/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
rename to buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
diff --git a/software/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch b/buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
rename to buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
diff --git a/software/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch b/buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch
similarity index 100%
rename from software/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch
rename to buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch
diff --git a/software/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch b/buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch
similarity index 100%
rename from software/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch
rename to buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch
diff --git a/software/package/gcc/5.5.0/890-fix-m68k-compile.patch b/buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch
similarity index 100%
rename from software/package/gcc/5.5.0/890-fix-m68k-compile.patch
rename to buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch
diff --git a/software/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch b/buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
rename to buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
diff --git a/software/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch b/buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
rename to buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
diff --git a/software/package/gcc/5.5.0/902-unwind-fix-for-musl.patch b/buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch
similarity index 100%
rename from software/package/gcc/5.5.0/902-unwind-fix-for-musl.patch
rename to buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch
diff --git a/software/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
similarity index 100%
rename from software/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
rename to buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
diff --git a/software/package/gcc/5.5.0/904-musl-libc-config.patch b/buildroot/package/gcc/5.5.0/904-musl-libc-config.patch
similarity index 100%
rename from software/package/gcc/5.5.0/904-musl-libc-config.patch
rename to buildroot/package/gcc/5.5.0/904-musl-libc-config.patch
diff --git a/software/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch b/buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch
similarity index 100%
rename from software/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch
rename to buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch
diff --git a/software/package/gcc/5.5.0/906-mips-musl-support.patch b/buildroot/package/gcc/5.5.0/906-mips-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/906-mips-musl-support.patch
rename to buildroot/package/gcc/5.5.0/906-mips-musl-support.patch
diff --git a/software/package/gcc/5.5.0/907-x86-musl-support.patch b/buildroot/package/gcc/5.5.0/907-x86-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/907-x86-musl-support.patch
rename to buildroot/package/gcc/5.5.0/907-x86-musl-support.patch
diff --git a/software/package/gcc/5.5.0/908-arm-musl-support.patch b/buildroot/package/gcc/5.5.0/908-arm-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/908-arm-musl-support.patch
rename to buildroot/package/gcc/5.5.0/908-arm-musl-support.patch
diff --git a/software/package/gcc/5.5.0/909-aarch64-musl-support.patch b/buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/909-aarch64-musl-support.patch
rename to buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch
diff --git a/software/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch b/buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch
similarity index 100%
rename from software/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch
rename to buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch
diff --git a/software/package/gcc/5.5.0/911-ppc-musl-support.patch b/buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/911-ppc-musl-support.patch
rename to buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch
diff --git a/software/package/gcc/5.5.0/912-sh-musl-support.patch b/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch
similarity index 100%
rename from software/package/gcc/5.5.0/912-sh-musl-support.patch
rename to buildroot/package/gcc/5.5.0/912-sh-musl-support.patch
diff --git a/software/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch b/buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
similarity index 100%
rename from software/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
rename to buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
diff --git a/software/package/gcc/5.5.0/940-uclinux-enable-threads.patch b/buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch
similarity index 100%
rename from software/package/gcc/5.5.0/940-uclinux-enable-threads.patch
rename to buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch
diff --git a/software/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch b/buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch
similarity index 100%
rename from software/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch
rename to buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch
diff --git a/software/package/gcc/7.5.0/0001-uclibc-conf.patch b/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0001-uclibc-conf.patch
rename to buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch
diff --git a/software/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch b/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch
rename to buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch
diff --git a/software/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch b/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch
rename to buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch
diff --git a/software/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch b/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch
rename to buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch
diff --git a/software/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch b/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch
rename to buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch
diff --git a/software/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
rename to buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
diff --git a/software/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch
similarity index 100%
rename from software/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch
rename to buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch
diff --git a/software/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch
similarity index 100%
rename from software/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch
rename to buildroot/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch
diff --git a/software/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch
similarity index 100%
rename from software/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch
rename to buildroot/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch
diff --git a/software/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch b/buildroot/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch
similarity index 100%
rename from software/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch
rename to buildroot/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch
diff --git a/software/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
similarity index 100%
rename from software/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
rename to buildroot/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch
diff --git a/software/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch b/buildroot/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch
similarity index 100%
rename from software/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch
rename to buildroot/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch
diff --git a/software/package/gcc/Config.in.host b/buildroot/package/gcc/Config.in.host
similarity index 100%
rename from software/package/gcc/Config.in.host
rename to buildroot/package/gcc/Config.in.host
diff --git a/software/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch b/buildroot/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch
similarity index 100%
rename from software/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch
rename to buildroot/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch
diff --git a/software/package/gcc/gcc-final/gcc-final.hash b/buildroot/package/gcc/gcc-final/gcc-final.hash
similarity index 100%
rename from software/package/gcc/gcc-final/gcc-final.hash
rename to buildroot/package/gcc/gcc-final/gcc-final.hash
diff --git a/software/package/gcc/gcc-final/gcc-final.mk b/buildroot/package/gcc/gcc-final/gcc-final.mk
similarity index 100%
rename from software/package/gcc/gcc-final/gcc-final.mk
rename to buildroot/package/gcc/gcc-final/gcc-final.mk
diff --git a/software/package/gcc/gcc-initial/gcc-initial.hash b/buildroot/package/gcc/gcc-initial/gcc-initial.hash
similarity index 100%
rename from software/package/gcc/gcc-initial/gcc-initial.hash
rename to buildroot/package/gcc/gcc-initial/gcc-initial.hash
diff --git a/software/package/gcc/gcc-initial/gcc-initial.mk b/buildroot/package/gcc/gcc-initial/gcc-initial.mk
similarity index 100%
rename from software/package/gcc/gcc-initial/gcc-initial.mk
rename to buildroot/package/gcc/gcc-initial/gcc-initial.mk
diff --git a/software/package/gcc/gcc.hash b/buildroot/package/gcc/gcc.hash
similarity index 100%
rename from software/package/gcc/gcc.hash
rename to buildroot/package/gcc/gcc.hash
diff --git a/software/package/gcc/gcc.mk b/buildroot/package/gcc/gcc.mk
similarity index 100%
rename from software/package/gcc/gcc.mk
rename to buildroot/package/gcc/gcc.mk
diff --git a/software/package/gcnano-binaries/Config.in b/buildroot/package/gcnano-binaries/Config.in
similarity index 100%
rename from software/package/gcnano-binaries/Config.in
rename to buildroot/package/gcnano-binaries/Config.in
diff --git a/software/package/gcnano-binaries/gcnano-binaries.hash b/buildroot/package/gcnano-binaries/gcnano-binaries.hash
similarity index 100%
rename from software/package/gcnano-binaries/gcnano-binaries.hash
rename to buildroot/package/gcnano-binaries/gcnano-binaries.hash
diff --git a/software/package/gcnano-binaries/gcnano-binaries.mk b/buildroot/package/gcnano-binaries/gcnano-binaries.mk
similarity index 100%
rename from software/package/gcnano-binaries/gcnano-binaries.mk
rename to buildroot/package/gcnano-binaries/gcnano-binaries.mk
diff --git a/software/package/gconf/Config.in b/buildroot/package/gconf/Config.in
similarity index 100%
rename from software/package/gconf/Config.in
rename to buildroot/package/gconf/Config.in
diff --git a/software/package/gconf/gconf.hash b/buildroot/package/gconf/gconf.hash
similarity index 100%
rename from software/package/gconf/gconf.hash
rename to buildroot/package/gconf/gconf.hash
diff --git a/software/package/gconf/gconf.mk b/buildroot/package/gconf/gconf.mk
similarity index 100%
rename from software/package/gconf/gconf.mk
rename to buildroot/package/gconf/gconf.mk
diff --git a/software/package/gcr/Config.in b/buildroot/package/gcr/Config.in
similarity index 100%
rename from software/package/gcr/Config.in
rename to buildroot/package/gcr/Config.in
diff --git a/software/package/gcr/gcr.hash b/buildroot/package/gcr/gcr.hash
similarity index 100%
rename from software/package/gcr/gcr.hash
rename to buildroot/package/gcr/gcr.hash
diff --git a/software/package/gcr/gcr.mk b/buildroot/package/gcr/gcr.mk
similarity index 100%
rename from software/package/gcr/gcr.mk
rename to buildroot/package/gcr/gcr.mk
diff --git a/software/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch b/buildroot/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch
similarity index 100%
rename from software/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch
rename to buildroot/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch
diff --git a/software/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch b/buildroot/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch
similarity index 100%
rename from software/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch
rename to buildroot/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch
diff --git a/software/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch b/buildroot/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch
similarity index 100%
rename from software/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch
rename to buildroot/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch
diff --git a/software/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch b/buildroot/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch
similarity index 100%
rename from software/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch
rename to buildroot/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch
diff --git a/software/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch b/buildroot/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch
similarity index 100%
rename from software/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch
rename to buildroot/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch
diff --git a/software/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch b/buildroot/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch
similarity index 100%
rename from software/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch
rename to buildroot/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch
diff --git a/software/package/gd/Config.in b/buildroot/package/gd/Config.in
similarity index 100%
rename from software/package/gd/Config.in
rename to buildroot/package/gd/Config.in
diff --git a/software/package/gd/gd.hash b/buildroot/package/gd/gd.hash
similarity index 100%
rename from software/package/gd/gd.hash
rename to buildroot/package/gd/gd.hash
diff --git a/software/package/gd/gd.mk b/buildroot/package/gd/gd.mk
similarity index 100%
rename from software/package/gd/gd.mk
rename to buildroot/package/gd/gd.mk
diff --git a/software/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to buildroot/package/gdb/8.1.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
diff --git a/software/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
rename to buildroot/package/gdb/8.1.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
diff --git a/software/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch
rename to buildroot/package/gdb/8.1.1/0003-use-asm-sgidefs.h.patch
diff --git a/software/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch
rename to buildroot/package/gdb/8.1.1/0004-gdbserver-fix-build-for-m68k.patch
diff --git a/software/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
rename to buildroot/package/gdb/8.1.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
diff --git a/software/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch b/buildroot/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
rename to buildroot/package/gdb/8.1.1/0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
diff --git a/software/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
similarity index 100%
rename from software/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
rename to buildroot/package/gdb/8.1.1/0007-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
diff --git a/software/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
similarity index 100%
rename from software/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
diff --git a/software/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
similarity index 100%
rename from software/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
rename to buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
diff --git a/software/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch
similarity index 100%
rename from software/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch
rename to buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch
diff --git a/software/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch
similarity index 100%
rename from software/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch
rename to buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch
diff --git a/software/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
similarity index 100%
rename from software/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
rename to buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
diff --git a/software/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
similarity index 100%
rename from software/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
diff --git a/software/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
similarity index 100%
rename from software/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
rename to buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
diff --git a/software/package/gdb/8.3/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch
similarity index 100%
rename from software/package/gdb/8.3/0003-use-asm-sgidefs.h.patch
rename to buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch
diff --git a/software/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch
similarity index 100%
rename from software/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch
rename to buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch
diff --git a/software/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch
similarity index 100%
rename from software/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch
rename to buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch
diff --git a/software/package/gdb/Config.in b/buildroot/package/gdb/Config.in
similarity index 100%
rename from software/package/gdb/Config.in
rename to buildroot/package/gdb/Config.in
diff --git a/software/package/gdb/Config.in.host b/buildroot/package/gdb/Config.in.host
similarity index 100%
rename from software/package/gdb/Config.in.host
rename to buildroot/package/gdb/Config.in.host
diff --git a/software/package/gdb/gdb-python-config b/buildroot/package/gdb/gdb-python-config
similarity index 100%
rename from software/package/gdb/gdb-python-config
rename to buildroot/package/gdb/gdb-python-config
diff --git a/software/package/gdb/gdb.hash b/buildroot/package/gdb/gdb.hash
similarity index 100%
rename from software/package/gdb/gdb.hash
rename to buildroot/package/gdb/gdb.hash
diff --git a/software/package/gdb/gdb.mk b/buildroot/package/gdb/gdb.mk
similarity index 100%
rename from software/package/gdb/gdb.mk
rename to buildroot/package/gdb/gdb.mk
diff --git a/software/package/gdbm/Config.in b/buildroot/package/gdbm/Config.in
similarity index 100%
rename from software/package/gdbm/Config.in
rename to buildroot/package/gdbm/Config.in
diff --git a/software/package/gdbm/gdbm.hash b/buildroot/package/gdbm/gdbm.hash
similarity index 100%
rename from software/package/gdbm/gdbm.hash
rename to buildroot/package/gdbm/gdbm.hash
diff --git a/software/package/gdbm/gdbm.mk b/buildroot/package/gdbm/gdbm.mk
similarity index 100%
rename from software/package/gdbm/gdbm.mk
rename to buildroot/package/gdbm/gdbm.mk
diff --git a/software/package/gdk-pixbuf/Config.in b/buildroot/package/gdk-pixbuf/Config.in
similarity index 100%
rename from software/package/gdk-pixbuf/Config.in
rename to buildroot/package/gdk-pixbuf/Config.in
diff --git a/software/package/gdk-pixbuf/gdk-pixbuf.hash b/buildroot/package/gdk-pixbuf/gdk-pixbuf.hash
similarity index 100%
rename from software/package/gdk-pixbuf/gdk-pixbuf.hash
rename to buildroot/package/gdk-pixbuf/gdk-pixbuf.hash
diff --git a/software/package/gdk-pixbuf/gdk-pixbuf.mk b/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk
similarity index 100%
rename from software/package/gdk-pixbuf/gdk-pixbuf.mk
rename to buildroot/package/gdk-pixbuf/gdk-pixbuf.mk
diff --git a/software/package/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch b/buildroot/package/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch
similarity index 100%
rename from software/package/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch
rename to buildroot/package/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch
diff --git a/software/package/genext2fs/Config.in b/buildroot/package/genext2fs/Config.in
similarity index 100%
rename from software/package/genext2fs/Config.in
rename to buildroot/package/genext2fs/Config.in
diff --git a/software/package/genext2fs/Config.in.host b/buildroot/package/genext2fs/Config.in.host
similarity index 100%
rename from software/package/genext2fs/Config.in.host
rename to buildroot/package/genext2fs/Config.in.host
diff --git a/software/package/genext2fs/genext2fs.hash b/buildroot/package/genext2fs/genext2fs.hash
similarity index 100%
rename from software/package/genext2fs/genext2fs.hash
rename to buildroot/package/genext2fs/genext2fs.hash
diff --git a/software/package/genext2fs/genext2fs.mk b/buildroot/package/genext2fs/genext2fs.mk
similarity index 100%
rename from software/package/genext2fs/genext2fs.mk
rename to buildroot/package/genext2fs/genext2fs.mk
diff --git a/software/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch b/buildroot/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
similarity index 100%
rename from software/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
rename to buildroot/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
diff --git a/software/package/gengetopt/gengetopt.hash b/buildroot/package/gengetopt/gengetopt.hash
similarity index 100%
rename from software/package/gengetopt/gengetopt.hash
rename to buildroot/package/gengetopt/gengetopt.hash
diff --git a/software/package/gengetopt/gengetopt.mk b/buildroot/package/gengetopt/gengetopt.mk
similarity index 100%
rename from software/package/gengetopt/gengetopt.mk
rename to buildroot/package/gengetopt/gengetopt.mk
diff --git a/software/package/genimage/Config.in.host b/buildroot/package/genimage/Config.in.host
similarity index 100%
rename from software/package/genimage/Config.in.host
rename to buildroot/package/genimage/Config.in.host
diff --git a/software/package/genimage/genimage.hash b/buildroot/package/genimage/genimage.hash
similarity index 100%
rename from software/package/genimage/genimage.hash
rename to buildroot/package/genimage/genimage.hash
diff --git a/software/package/genimage/genimage.mk b/buildroot/package/genimage/genimage.mk
similarity index 100%
rename from software/package/genimage/genimage.mk
rename to buildroot/package/genimage/genimage.mk
diff --git a/software/package/genpart/0001-fix-return-code.patch b/buildroot/package/genpart/0001-fix-return-code.patch
similarity index 100%
rename from software/package/genpart/0001-fix-return-code.patch
rename to buildroot/package/genpart/0001-fix-return-code.patch
diff --git a/software/package/genpart/Config.in b/buildroot/package/genpart/Config.in
similarity index 100%
rename from software/package/genpart/Config.in
rename to buildroot/package/genpart/Config.in
diff --git a/software/package/genpart/Config.in.host b/buildroot/package/genpart/Config.in.host
similarity index 100%
rename from software/package/genpart/Config.in.host
rename to buildroot/package/genpart/Config.in.host
diff --git a/software/package/genpart/genpart.hash b/buildroot/package/genpart/genpart.hash
similarity index 100%
rename from software/package/genpart/genpart.hash
rename to buildroot/package/genpart/genpart.hash
diff --git a/software/package/genpart/genpart.mk b/buildroot/package/genpart/genpart.mk
similarity index 100%
rename from software/package/genpart/genpart.mk
rename to buildroot/package/genpart/genpart.mk
diff --git a/software/package/genromfs/0001-build-system.patch b/buildroot/package/genromfs/0001-build-system.patch
similarity index 100%
rename from software/package/genromfs/0001-build-system.patch
rename to buildroot/package/genromfs/0001-build-system.patch
diff --git a/software/package/genromfs/Config.in b/buildroot/package/genromfs/Config.in
similarity index 100%
rename from software/package/genromfs/Config.in
rename to buildroot/package/genromfs/Config.in
diff --git a/software/package/genromfs/genromfs.hash b/buildroot/package/genromfs/genromfs.hash
similarity index 100%
rename from software/package/genromfs/genromfs.hash
rename to buildroot/package/genromfs/genromfs.hash
diff --git a/software/package/genromfs/genromfs.mk b/buildroot/package/genromfs/genromfs.mk
similarity index 100%
rename from software/package/genromfs/genromfs.mk
rename to buildroot/package/genromfs/genromfs.mk
diff --git a/software/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch b/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch
similarity index 100%
rename from software/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch
rename to buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch
diff --git a/software/package/gensio/Config.in b/buildroot/package/gensio/Config.in
similarity index 100%
rename from software/package/gensio/Config.in
rename to buildroot/package/gensio/Config.in
diff --git a/software/package/gensio/gensio.hash b/buildroot/package/gensio/gensio.hash
similarity index 100%
rename from software/package/gensio/gensio.hash
rename to buildroot/package/gensio/gensio.hash
diff --git a/software/package/gensio/gensio.mk b/buildroot/package/gensio/gensio.mk
similarity index 100%
rename from software/package/gensio/gensio.mk
rename to buildroot/package/gensio/gensio.mk
diff --git a/software/package/geoip/Config.in b/buildroot/package/geoip/Config.in
similarity index 100%
rename from software/package/geoip/Config.in
rename to buildroot/package/geoip/Config.in
diff --git a/software/package/geoip/geoip.hash b/buildroot/package/geoip/geoip.hash
similarity index 100%
rename from software/package/geoip/geoip.hash
rename to buildroot/package/geoip/geoip.hash
diff --git a/software/package/geoip/geoip.mk b/buildroot/package/geoip/geoip.mk
similarity index 100%
rename from software/package/geoip/geoip.mk
rename to buildroot/package/geoip/geoip.mk
diff --git a/software/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch b/buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch
similarity index 100%
rename from software/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch
rename to buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch
diff --git a/software/package/gerbera/Config.in b/buildroot/package/gerbera/Config.in
similarity index 100%
rename from software/package/gerbera/Config.in
rename to buildroot/package/gerbera/Config.in
diff --git a/software/package/gerbera/S99gerbera b/buildroot/package/gerbera/S99gerbera
similarity index 100%
rename from software/package/gerbera/S99gerbera
rename to buildroot/package/gerbera/S99gerbera
diff --git a/software/package/gerbera/config.xml b/buildroot/package/gerbera/config.xml
similarity index 100%
rename from software/package/gerbera/config.xml
rename to buildroot/package/gerbera/config.xml
diff --git a/software/package/gerbera/gerbera.hash b/buildroot/package/gerbera/gerbera.hash
similarity index 100%
rename from software/package/gerbera/gerbera.hash
rename to buildroot/package/gerbera/gerbera.hash
diff --git a/software/package/gerbera/gerbera.mk b/buildroot/package/gerbera/gerbera.mk
similarity index 100%
rename from software/package/gerbera/gerbera.mk
rename to buildroot/package/gerbera/gerbera.mk
diff --git a/software/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch b/buildroot/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch
similarity index 100%
rename from software/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch
rename to buildroot/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch
diff --git a/software/package/gesftpserver/Config.in b/buildroot/package/gesftpserver/Config.in
similarity index 100%
rename from software/package/gesftpserver/Config.in
rename to buildroot/package/gesftpserver/Config.in
diff --git a/software/package/gesftpserver/gesftpserver.hash b/buildroot/package/gesftpserver/gesftpserver.hash
similarity index 100%
rename from software/package/gesftpserver/gesftpserver.hash
rename to buildroot/package/gesftpserver/gesftpserver.hash
diff --git a/software/package/gesftpserver/gesftpserver.mk b/buildroot/package/gesftpserver/gesftpserver.mk
similarity index 100%
rename from software/package/gesftpserver/gesftpserver.mk
rename to buildroot/package/gesftpserver/gesftpserver.mk
diff --git a/software/package/getent/Config.in b/buildroot/package/getent/Config.in
similarity index 100%
rename from software/package/getent/Config.in
rename to buildroot/package/getent/Config.in
diff --git a/software/package/getent/getent b/buildroot/package/getent/getent
similarity index 100%
rename from software/package/getent/getent
rename to buildroot/package/getent/getent
diff --git a/software/package/getent/getent.mk b/buildroot/package/getent/getent.mk
similarity index 100%
rename from software/package/getent/getent.mk
rename to buildroot/package/getent/getent.mk
diff --git a/software/package/gettext-gnu/0001-error_print_progname.patch b/buildroot/package/gettext-gnu/0001-error_print_progname.patch
similarity index 100%
rename from software/package/gettext-gnu/0001-error_print_progname.patch
rename to buildroot/package/gettext-gnu/0001-error_print_progname.patch
diff --git a/software/package/gettext-gnu/0002-Update-after-gnulib-changed.patch b/buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch
similarity index 100%
rename from software/package/gettext-gnu/0002-Update-after-gnulib-changed.patch
rename to buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch
diff --git a/software/package/gettext-gnu/Config.in b/buildroot/package/gettext-gnu/Config.in
similarity index 100%
rename from software/package/gettext-gnu/Config.in
rename to buildroot/package/gettext-gnu/Config.in
diff --git a/software/package/gettext-gnu/gettext-gnu.hash b/buildroot/package/gettext-gnu/gettext-gnu.hash
similarity index 100%
rename from software/package/gettext-gnu/gettext-gnu.hash
rename to buildroot/package/gettext-gnu/gettext-gnu.hash
diff --git a/software/package/gettext-gnu/gettext-gnu.mk b/buildroot/package/gettext-gnu/gettext-gnu.mk
similarity index 100%
rename from software/package/gettext-gnu/gettext-gnu.mk
rename to buildroot/package/gettext-gnu/gettext-gnu.mk
diff --git a/software/package/gettext-tiny/Config.in b/buildroot/package/gettext-tiny/Config.in
similarity index 100%
rename from software/package/gettext-tiny/Config.in
rename to buildroot/package/gettext-tiny/Config.in
diff --git a/software/package/gettext-tiny/gettext-tiny.hash b/buildroot/package/gettext-tiny/gettext-tiny.hash
similarity index 100%
rename from software/package/gettext-tiny/gettext-tiny.hash
rename to buildroot/package/gettext-tiny/gettext-tiny.hash
diff --git a/software/package/gettext-tiny/gettext-tiny.mk b/buildroot/package/gettext-tiny/gettext-tiny.mk
similarity index 100%
rename from software/package/gettext-tiny/gettext-tiny.mk
rename to buildroot/package/gettext-tiny/gettext-tiny.mk
diff --git a/software/package/gettext-tiny/gettext-wrapper b/buildroot/package/gettext-tiny/gettext-wrapper
similarity index 100%
rename from software/package/gettext-tiny/gettext-wrapper
rename to buildroot/package/gettext-tiny/gettext-wrapper
diff --git a/software/package/gettext/Config.in b/buildroot/package/gettext/Config.in
similarity index 100%
rename from software/package/gettext/Config.in
rename to buildroot/package/gettext/Config.in
diff --git a/software/package/gettext/gettext.mk b/buildroot/package/gettext/gettext.mk
similarity index 100%
rename from software/package/gettext/gettext.mk
rename to buildroot/package/gettext/gettext.mk
diff --git a/software/package/gflags/Config.in b/buildroot/package/gflags/Config.in
similarity index 100%
rename from software/package/gflags/Config.in
rename to buildroot/package/gflags/Config.in
diff --git a/software/package/gflags/gflags.hash b/buildroot/package/gflags/gflags.hash
similarity index 100%
rename from software/package/gflags/gflags.hash
rename to buildroot/package/gflags/gflags.hash
diff --git a/software/package/gflags/gflags.mk b/buildroot/package/gflags/gflags.mk
similarity index 100%
rename from software/package/gflags/gflags.mk
rename to buildroot/package/gflags/gflags.mk
diff --git a/software/package/ghostscript-fonts/Config.in b/buildroot/package/ghostscript-fonts/Config.in
similarity index 100%
rename from software/package/ghostscript-fonts/Config.in
rename to buildroot/package/ghostscript-fonts/Config.in
diff --git a/software/package/ghostscript-fonts/ghostscript-fonts.hash b/buildroot/package/ghostscript-fonts/ghostscript-fonts.hash
similarity index 100%
rename from software/package/ghostscript-fonts/ghostscript-fonts.hash
rename to buildroot/package/ghostscript-fonts/ghostscript-fonts.hash
diff --git a/software/package/ghostscript-fonts/ghostscript-fonts.mk b/buildroot/package/ghostscript-fonts/ghostscript-fonts.mk
similarity index 100%
rename from software/package/ghostscript-fonts/ghostscript-fonts.mk
rename to buildroot/package/ghostscript-fonts/ghostscript-fonts.mk
diff --git a/software/package/ghostscript/Config.in b/buildroot/package/ghostscript/Config.in
similarity index 100%
rename from software/package/ghostscript/Config.in
rename to buildroot/package/ghostscript/Config.in
diff --git a/software/package/ghostscript/ghostscript.hash b/buildroot/package/ghostscript/ghostscript.hash
similarity index 100%
rename from software/package/ghostscript/ghostscript.hash
rename to buildroot/package/ghostscript/ghostscript.hash
diff --git a/software/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk
similarity index 100%
rename from software/package/ghostscript/ghostscript.mk
rename to buildroot/package/ghostscript/ghostscript.mk
diff --git a/software/package/giblib/0001-fix-imlib2-detection.patch b/buildroot/package/giblib/0001-fix-imlib2-detection.patch
similarity index 100%
rename from software/package/giblib/0001-fix-imlib2-detection.patch
rename to buildroot/package/giblib/0001-fix-imlib2-detection.patch
diff --git a/software/package/giblib/Config.in b/buildroot/package/giblib/Config.in
similarity index 100%
rename from software/package/giblib/Config.in
rename to buildroot/package/giblib/Config.in
diff --git a/software/package/giblib/giblib.hash b/buildroot/package/giblib/giblib.hash
similarity index 100%
rename from software/package/giblib/giblib.hash
rename to buildroot/package/giblib/giblib.hash
diff --git a/software/package/giblib/giblib.mk b/buildroot/package/giblib/giblib.mk
similarity index 100%
rename from software/package/giblib/giblib.mk
rename to buildroot/package/giblib/giblib.mk
diff --git a/software/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/buildroot/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch
similarity index 100%
rename from software/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch
rename to buildroot/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch
diff --git a/software/package/giflib/Config.in b/buildroot/package/giflib/Config.in
similarity index 100%
rename from software/package/giflib/Config.in
rename to buildroot/package/giflib/Config.in
diff --git a/software/package/giflib/giflib.hash b/buildroot/package/giflib/giflib.hash
similarity index 100%
rename from software/package/giflib/giflib.hash
rename to buildroot/package/giflib/giflib.hash
diff --git a/software/package/giflib/giflib.mk b/buildroot/package/giflib/giflib.mk
similarity index 100%
rename from software/package/giflib/giflib.mk
rename to buildroot/package/giflib/giflib.mk
diff --git a/software/package/git-crypt/Config.in b/buildroot/package/git-crypt/Config.in
similarity index 100%
rename from software/package/git-crypt/Config.in
rename to buildroot/package/git-crypt/Config.in
diff --git a/software/package/git-crypt/git-crypt.hash b/buildroot/package/git-crypt/git-crypt.hash
similarity index 100%
rename from software/package/git-crypt/git-crypt.hash
rename to buildroot/package/git-crypt/git-crypt.hash
diff --git a/software/package/git-crypt/git-crypt.mk b/buildroot/package/git-crypt/git-crypt.mk
similarity index 100%
rename from software/package/git-crypt/git-crypt.mk
rename to buildroot/package/git-crypt/git-crypt.mk
diff --git a/software/package/git/Config.in b/buildroot/package/git/Config.in
similarity index 100%
rename from software/package/git/Config.in
rename to buildroot/package/git/Config.in
diff --git a/software/package/git/git.hash b/buildroot/package/git/git.hash
similarity index 100%
rename from software/package/git/git.hash
rename to buildroot/package/git/git.hash
diff --git a/software/package/git/git.mk b/buildroot/package/git/git.mk
similarity index 100%
rename from software/package/git/git.mk
rename to buildroot/package/git/git.mk
diff --git a/software/package/gli/Config.in b/buildroot/package/gli/Config.in
similarity index 100%
rename from software/package/gli/Config.in
rename to buildroot/package/gli/Config.in
diff --git a/software/package/gli/gli.hash b/buildroot/package/gli/gli.hash
similarity index 100%
rename from software/package/gli/gli.hash
rename to buildroot/package/gli/gli.hash
diff --git a/software/package/gli/gli.mk b/buildroot/package/gli/gli.mk
similarity index 100%
rename from software/package/gli/gli.mk
rename to buildroot/package/gli/gli.mk
diff --git a/software/package/glib-networking/Config.in b/buildroot/package/glib-networking/Config.in
similarity index 100%
rename from software/package/glib-networking/Config.in
rename to buildroot/package/glib-networking/Config.in
diff --git a/software/package/glib-networking/glib-networking.hash b/buildroot/package/glib-networking/glib-networking.hash
similarity index 100%
rename from software/package/glib-networking/glib-networking.hash
rename to buildroot/package/glib-networking/glib-networking.hash
diff --git a/software/package/glib-networking/glib-networking.mk b/buildroot/package/glib-networking/glib-networking.mk
similarity index 100%
rename from software/package/glib-networking/glib-networking.mk
rename to buildroot/package/glib-networking/glib-networking.mk
diff --git a/software/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash b/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash
similarity index 100%
rename from software/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash
rename to buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash
diff --git a/software/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash b/buildroot/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash
similarity index 100%
rename from software/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash
rename to buildroot/package/glibc/2.30-73-gd59630f9959b0bb8991964758ab854ff4378b20d/glibc.hash
diff --git a/software/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash b/buildroot/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
similarity index 100%
rename from software/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
rename to buildroot/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
diff --git a/software/package/glibc/Config.in b/buildroot/package/glibc/Config.in
similarity index 100%
rename from software/package/glibc/Config.in
rename to buildroot/package/glibc/Config.in
diff --git a/software/package/glibc/arc-2019.09-release/glibc.hash b/buildroot/package/glibc/arc-2019.09-release/glibc.hash
similarity index 100%
rename from software/package/glibc/arc-2019.09-release/glibc.hash
rename to buildroot/package/glibc/arc-2019.09-release/glibc.hash
diff --git a/software/package/glibc/glibc.hash b/buildroot/package/glibc/glibc.hash
similarity index 100%
rename from software/package/glibc/glibc.hash
rename to buildroot/package/glibc/glibc.hash
diff --git a/software/package/glibc/glibc.mk b/buildroot/package/glibc/glibc.mk
similarity index 100%
rename from software/package/glibc/glibc.mk
rename to buildroot/package/glibc/glibc.mk
diff --git a/software/package/glibc/nsswitch.conf b/buildroot/package/glibc/nsswitch.conf
similarity index 100%
rename from software/package/glibc/nsswitch.conf
rename to buildroot/package/glibc/nsswitch.conf
diff --git a/software/package/glibmm/Config.in b/buildroot/package/glibmm/Config.in
similarity index 100%
rename from software/package/glibmm/Config.in
rename to buildroot/package/glibmm/Config.in
diff --git a/software/package/glibmm/glibmm.hash b/buildroot/package/glibmm/glibmm.hash
similarity index 100%
rename from software/package/glibmm/glibmm.hash
rename to buildroot/package/glibmm/glibmm.hash
diff --git a/software/package/glibmm/glibmm.mk b/buildroot/package/glibmm/glibmm.mk
similarity index 100%
rename from software/package/glibmm/glibmm.mk
rename to buildroot/package/glibmm/glibmm.mk
diff --git a/software/package/glm/Config.in b/buildroot/package/glm/Config.in
similarity index 100%
rename from software/package/glm/Config.in
rename to buildroot/package/glm/Config.in
diff --git a/software/package/glm/glm.hash b/buildroot/package/glm/glm.hash
similarity index 100%
rename from software/package/glm/glm.hash
rename to buildroot/package/glm/glm.hash
diff --git a/software/package/glm/glm.mk b/buildroot/package/glm/glm.mk
similarity index 100%
rename from software/package/glm/glm.mk
rename to buildroot/package/glm/glm.mk
diff --git a/software/package/glmark2/Config.in b/buildroot/package/glmark2/Config.in
similarity index 100%
rename from software/package/glmark2/Config.in
rename to buildroot/package/glmark2/Config.in
diff --git a/software/package/glmark2/glmark2.hash b/buildroot/package/glmark2/glmark2.hash
similarity index 100%
rename from software/package/glmark2/glmark2.hash
rename to buildroot/package/glmark2/glmark2.hash
diff --git a/software/package/glmark2/glmark2.mk b/buildroot/package/glmark2/glmark2.mk
similarity index 100%
rename from software/package/glmark2/glmark2.mk
rename to buildroot/package/glmark2/glmark2.mk
diff --git a/software/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch b/buildroot/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch
similarity index 100%
rename from software/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch
rename to buildroot/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch
diff --git a/software/package/glog/0002-src-utilities-fix-build-without-pthread.patch b/buildroot/package/glog/0002-src-utilities-fix-build-without-pthread.patch
similarity index 100%
rename from software/package/glog/0002-src-utilities-fix-build-without-pthread.patch
rename to buildroot/package/glog/0002-src-utilities-fix-build-without-pthread.patch
diff --git a/software/package/glog/Config.in b/buildroot/package/glog/Config.in
similarity index 100%
rename from software/package/glog/Config.in
rename to buildroot/package/glog/Config.in
diff --git a/software/package/glog/glog.hash b/buildroot/package/glog/glog.hash
similarity index 100%
rename from software/package/glog/glog.hash
rename to buildroot/package/glog/glog.hash
diff --git a/software/package/glog/glog.mk b/buildroot/package/glog/glog.mk
similarity index 100%
rename from software/package/glog/glog.mk
rename to buildroot/package/glog/glog.mk
diff --git a/software/package/glorytun/Config.in b/buildroot/package/glorytun/Config.in
similarity index 100%
rename from software/package/glorytun/Config.in
rename to buildroot/package/glorytun/Config.in
diff --git a/software/package/glorytun/glorytun.hash b/buildroot/package/glorytun/glorytun.hash
similarity index 100%
rename from software/package/glorytun/glorytun.hash
rename to buildroot/package/glorytun/glorytun.hash
diff --git a/software/package/glorytun/glorytun.mk b/buildroot/package/glorytun/glorytun.mk
similarity index 100%
rename from software/package/glorytun/glorytun.mk
rename to buildroot/package/glorytun/glorytun.mk
diff --git a/software/package/glslsandbox-player/Config.in b/buildroot/package/glslsandbox-player/Config.in
similarity index 100%
rename from software/package/glslsandbox-player/Config.in
rename to buildroot/package/glslsandbox-player/Config.in
diff --git a/software/package/glslsandbox-player/glslsandbox-player.hash b/buildroot/package/glslsandbox-player/glslsandbox-player.hash
similarity index 100%
rename from software/package/glslsandbox-player/glslsandbox-player.hash
rename to buildroot/package/glslsandbox-player/glslsandbox-player.hash
diff --git a/software/package/glslsandbox-player/glslsandbox-player.mk b/buildroot/package/glslsandbox-player/glslsandbox-player.mk
similarity index 100%
rename from software/package/glslsandbox-player/glslsandbox-player.mk
rename to buildroot/package/glslsandbox-player/glslsandbox-player.mk
diff --git a/software/package/gmp/Config.in b/buildroot/package/gmp/Config.in
similarity index 100%
rename from software/package/gmp/Config.in
rename to buildroot/package/gmp/Config.in
diff --git a/software/package/gmp/gmp.hash b/buildroot/package/gmp/gmp.hash
similarity index 100%
rename from software/package/gmp/gmp.hash
rename to buildroot/package/gmp/gmp.hash
diff --git a/software/package/gmp/gmp.mk b/buildroot/package/gmp/gmp.mk
similarity index 100%
rename from software/package/gmp/gmp.mk
rename to buildroot/package/gmp/gmp.mk
diff --git a/software/package/gmpc/Config.in b/buildroot/package/gmpc/Config.in
similarity index 100%
rename from software/package/gmpc/Config.in
rename to buildroot/package/gmpc/Config.in
diff --git a/software/package/gmpc/gmpc.hash b/buildroot/package/gmpc/gmpc.hash
similarity index 100%
rename from software/package/gmpc/gmpc.hash
rename to buildroot/package/gmpc/gmpc.hash
diff --git a/software/package/gmpc/gmpc.mk b/buildroot/package/gmpc/gmpc.mk
similarity index 100%
rename from software/package/gmpc/gmpc.mk
rename to buildroot/package/gmpc/gmpc.mk
diff --git a/software/package/gmrender-resurrect/Config.in b/buildroot/package/gmrender-resurrect/Config.in
similarity index 100%
rename from software/package/gmrender-resurrect/Config.in
rename to buildroot/package/gmrender-resurrect/Config.in
diff --git a/software/package/gmrender-resurrect/gmrender-resurrect.hash b/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash
similarity index 100%
rename from software/package/gmrender-resurrect/gmrender-resurrect.hash
rename to buildroot/package/gmrender-resurrect/gmrender-resurrect.hash
diff --git a/software/package/gmrender-resurrect/gmrender-resurrect.mk b/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk
similarity index 100%
rename from software/package/gmrender-resurrect/gmrender-resurrect.mk
rename to buildroot/package/gmrender-resurrect/gmrender-resurrect.mk
diff --git a/software/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch b/buildroot/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch
similarity index 100%
rename from software/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch
rename to buildroot/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch
diff --git a/software/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch b/buildroot/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch
similarity index 100%
rename from software/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch
rename to buildroot/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch
diff --git a/software/package/gnu-efi/Config.in b/buildroot/package/gnu-efi/Config.in
similarity index 100%
rename from software/package/gnu-efi/Config.in
rename to buildroot/package/gnu-efi/Config.in
diff --git a/software/package/gnu-efi/gnu-efi.hash b/buildroot/package/gnu-efi/gnu-efi.hash
similarity index 100%
rename from software/package/gnu-efi/gnu-efi.hash
rename to buildroot/package/gnu-efi/gnu-efi.hash
diff --git a/software/package/gnu-efi/gnu-efi.mk b/buildroot/package/gnu-efi/gnu-efi.mk
similarity index 100%
rename from software/package/gnu-efi/gnu-efi.mk
rename to buildroot/package/gnu-efi/gnu-efi.mk
diff --git a/software/package/gnuchess/Config.in b/buildroot/package/gnuchess/Config.in
similarity index 100%
rename from software/package/gnuchess/Config.in
rename to buildroot/package/gnuchess/Config.in
diff --git a/software/package/gnuchess/gnuchess.hash b/buildroot/package/gnuchess/gnuchess.hash
similarity index 100%
rename from software/package/gnuchess/gnuchess.hash
rename to buildroot/package/gnuchess/gnuchess.hash
diff --git a/software/package/gnuchess/gnuchess.mk b/buildroot/package/gnuchess/gnuchess.mk
similarity index 100%
rename from software/package/gnuchess/gnuchess.mk
rename to buildroot/package/gnuchess/gnuchess.mk
diff --git a/software/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch b/buildroot/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch
similarity index 100%
rename from software/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch
rename to buildroot/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch
diff --git a/software/package/gnupg/Config.in b/buildroot/package/gnupg/Config.in
similarity index 100%
rename from software/package/gnupg/Config.in
rename to buildroot/package/gnupg/Config.in
diff --git a/software/package/gnupg/Config.in.host b/buildroot/package/gnupg/Config.in.host
similarity index 100%
rename from software/package/gnupg/Config.in.host
rename to buildroot/package/gnupg/Config.in.host
diff --git a/software/package/gnupg/gnupg.hash b/buildroot/package/gnupg/gnupg.hash
similarity index 100%
rename from software/package/gnupg/gnupg.hash
rename to buildroot/package/gnupg/gnupg.hash
diff --git a/software/package/gnupg/gnupg.mk b/buildroot/package/gnupg/gnupg.mk
similarity index 100%
rename from software/package/gnupg/gnupg.mk
rename to buildroot/package/gnupg/gnupg.mk
diff --git a/software/package/gnupg2/Config.in b/buildroot/package/gnupg2/Config.in
similarity index 100%
rename from software/package/gnupg2/Config.in
rename to buildroot/package/gnupg2/Config.in
diff --git a/software/package/gnupg2/gnupg2.hash b/buildroot/package/gnupg2/gnupg2.hash
similarity index 100%
rename from software/package/gnupg2/gnupg2.hash
rename to buildroot/package/gnupg2/gnupg2.hash
diff --git a/software/package/gnupg2/gnupg2.mk b/buildroot/package/gnupg2/gnupg2.mk
similarity index 100%
rename from software/package/gnupg2/gnupg2.mk
rename to buildroot/package/gnupg2/gnupg2.mk
diff --git a/software/package/gnuplot/0001-configure-add-without-demo-option.patch b/buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch
similarity index 100%
rename from software/package/gnuplot/0001-configure-add-without-demo-option.patch
rename to buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch
diff --git a/software/package/gnuplot/0002-use-gdlib-config-properly.patch b/buildroot/package/gnuplot/0002-use-gdlib-config-properly.patch
similarity index 100%
rename from software/package/gnuplot/0002-use-gdlib-config-properly.patch
rename to buildroot/package/gnuplot/0002-use-gdlib-config-properly.patch
diff --git a/software/package/gnuplot/Config.in b/buildroot/package/gnuplot/Config.in
similarity index 100%
rename from software/package/gnuplot/Config.in
rename to buildroot/package/gnuplot/Config.in
diff --git a/software/package/gnuplot/gnuplot.hash b/buildroot/package/gnuplot/gnuplot.hash
similarity index 100%
rename from software/package/gnuplot/gnuplot.hash
rename to buildroot/package/gnuplot/gnuplot.hash
diff --git a/software/package/gnuplot/gnuplot.mk b/buildroot/package/gnuplot/gnuplot.mk
similarity index 100%
rename from software/package/gnuplot/gnuplot.mk
rename to buildroot/package/gnuplot/gnuplot.mk
diff --git a/software/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch b/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch
similarity index 100%
rename from software/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch
rename to buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch
diff --git a/software/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch b/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch
similarity index 100%
rename from software/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch
rename to buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch
diff --git a/software/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch b/buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch
similarity index 100%
rename from software/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch
rename to buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch
diff --git a/software/package/gnuradio/Config.in b/buildroot/package/gnuradio/Config.in
similarity index 100%
rename from software/package/gnuradio/Config.in
rename to buildroot/package/gnuradio/Config.in
diff --git a/software/package/gnuradio/gnuradio.hash b/buildroot/package/gnuradio/gnuradio.hash
similarity index 100%
rename from software/package/gnuradio/gnuradio.hash
rename to buildroot/package/gnuradio/gnuradio.hash
diff --git a/software/package/gnuradio/gnuradio.mk b/buildroot/package/gnuradio/gnuradio.mk
similarity index 100%
rename from software/package/gnuradio/gnuradio.mk
rename to buildroot/package/gnuradio/gnuradio.mk
diff --git a/software/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch b/buildroot/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch
similarity index 100%
rename from software/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch
rename to buildroot/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch
diff --git a/software/package/gnutls/Config.in b/buildroot/package/gnutls/Config.in
similarity index 100%
rename from software/package/gnutls/Config.in
rename to buildroot/package/gnutls/Config.in
diff --git a/software/package/gnutls/gnutls.hash b/buildroot/package/gnutls/gnutls.hash
similarity index 100%
rename from software/package/gnutls/gnutls.hash
rename to buildroot/package/gnutls/gnutls.hash
diff --git a/software/package/gnutls/gnutls.mk b/buildroot/package/gnutls/gnutls.mk
similarity index 100%
rename from software/package/gnutls/gnutls.mk
rename to buildroot/package/gnutls/gnutls.mk
diff --git a/software/package/go-bootstrap/Config.in.host b/buildroot/package/go-bootstrap/Config.in.host
similarity index 100%
rename from software/package/go-bootstrap/Config.in.host
rename to buildroot/package/go-bootstrap/Config.in.host
diff --git a/software/package/go-bootstrap/go-bootstrap.hash b/buildroot/package/go-bootstrap/go-bootstrap.hash
similarity index 100%
rename from software/package/go-bootstrap/go-bootstrap.hash
rename to buildroot/package/go-bootstrap/go-bootstrap.hash
diff --git a/software/package/go-bootstrap/go-bootstrap.mk b/buildroot/package/go-bootstrap/go-bootstrap.mk
similarity index 100%
rename from software/package/go-bootstrap/go-bootstrap.mk
rename to buildroot/package/go-bootstrap/go-bootstrap.mk
diff --git a/software/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/buildroot/package/go/0001-build.go-explicit-option-for-crosscompilation.patch
similarity index 100%
rename from software/package/go/0001-build.go-explicit-option-for-crosscompilation.patch
rename to buildroot/package/go/0001-build.go-explicit-option-for-crosscompilation.patch
diff --git a/software/package/go/Config.in.host b/buildroot/package/go/Config.in.host
similarity index 100%
rename from software/package/go/Config.in.host
rename to buildroot/package/go/Config.in.host
diff --git a/software/package/go/go.hash b/buildroot/package/go/go.hash
similarity index 100%
rename from software/package/go/go.hash
rename to buildroot/package/go/go.hash
diff --git a/software/package/go/go.mk b/buildroot/package/go/go.mk
similarity index 100%
rename from software/package/go/go.mk
rename to buildroot/package/go/go.mk
diff --git a/software/package/gob2/0001-dont-include-from-prefix.patch b/buildroot/package/gob2/0001-dont-include-from-prefix.patch
similarity index 100%
rename from software/package/gob2/0001-dont-include-from-prefix.patch
rename to buildroot/package/gob2/0001-dont-include-from-prefix.patch
diff --git a/software/package/gob2/gob2.hash b/buildroot/package/gob2/gob2.hash
similarity index 100%
rename from software/package/gob2/gob2.hash
rename to buildroot/package/gob2/gob2.hash
diff --git a/software/package/gob2/gob2.mk b/buildroot/package/gob2/gob2.mk
similarity index 100%
rename from software/package/gob2/gob2.mk
rename to buildroot/package/gob2/gob2.mk
diff --git a/software/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch b/buildroot/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch
similarity index 100%
rename from software/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch
rename to buildroot/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch
diff --git a/software/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch b/buildroot/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch
similarity index 100%
rename from software/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch
rename to buildroot/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch
diff --git a/software/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch b/buildroot/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch
similarity index 100%
rename from software/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch
rename to buildroot/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch
diff --git a/software/package/google-breakpad/Config.in b/buildroot/package/google-breakpad/Config.in
similarity index 100%
rename from software/package/google-breakpad/Config.in
rename to buildroot/package/google-breakpad/Config.in
diff --git a/software/package/google-breakpad/Config.in.host b/buildroot/package/google-breakpad/Config.in.host
similarity index 100%
rename from software/package/google-breakpad/Config.in.host
rename to buildroot/package/google-breakpad/Config.in.host
diff --git a/software/package/google-breakpad/gen-syms.sh b/buildroot/package/google-breakpad/gen-syms.sh
similarity index 100%
rename from software/package/google-breakpad/gen-syms.sh
rename to buildroot/package/google-breakpad/gen-syms.sh
diff --git a/software/package/google-breakpad/google-breakpad.hash b/buildroot/package/google-breakpad/google-breakpad.hash
similarity index 100%
rename from software/package/google-breakpad/google-breakpad.hash
rename to buildroot/package/google-breakpad/google-breakpad.hash
diff --git a/software/package/google-breakpad/google-breakpad.mk b/buildroot/package/google-breakpad/google-breakpad.mk
similarity index 100%
rename from software/package/google-breakpad/google-breakpad.mk
rename to buildroot/package/google-breakpad/google-breakpad.mk
diff --git a/software/package/google-material-design-icons/Config.in b/buildroot/package/google-material-design-icons/Config.in
similarity index 100%
rename from software/package/google-material-design-icons/Config.in
rename to buildroot/package/google-material-design-icons/Config.in
diff --git a/software/package/google-material-design-icons/google-material-design-icons.hash b/buildroot/package/google-material-design-icons/google-material-design-icons.hash
similarity index 100%
rename from software/package/google-material-design-icons/google-material-design-icons.hash
rename to buildroot/package/google-material-design-icons/google-material-design-icons.hash
diff --git a/software/package/google-material-design-icons/google-material-design-icons.mk b/buildroot/package/google-material-design-icons/google-material-design-icons.mk
similarity index 100%
rename from software/package/google-material-design-icons/google-material-design-icons.mk
rename to buildroot/package/google-material-design-icons/google-material-design-icons.mk
diff --git a/software/package/googlefontdirectory/Config.in b/buildroot/package/googlefontdirectory/Config.in
similarity index 100%
rename from software/package/googlefontdirectory/Config.in
rename to buildroot/package/googlefontdirectory/Config.in
diff --git a/software/package/googlefontdirectory/googlefontdirectory.hash b/buildroot/package/googlefontdirectory/googlefontdirectory.hash
similarity index 100%
rename from software/package/googlefontdirectory/googlefontdirectory.hash
rename to buildroot/package/googlefontdirectory/googlefontdirectory.hash
diff --git a/software/package/googlefontdirectory/googlefontdirectory.mk b/buildroot/package/googlefontdirectory/googlefontdirectory.mk
similarity index 100%
rename from software/package/googlefontdirectory/googlefontdirectory.mk
rename to buildroot/package/googlefontdirectory/googlefontdirectory.mk
diff --git a/software/package/gperf/Config.in b/buildroot/package/gperf/Config.in
similarity index 100%
rename from software/package/gperf/Config.in
rename to buildroot/package/gperf/Config.in
diff --git a/software/package/gperf/gperf.hash b/buildroot/package/gperf/gperf.hash
similarity index 100%
rename from software/package/gperf/gperf.hash
rename to buildroot/package/gperf/gperf.hash
diff --git a/software/package/gperf/gperf.mk b/buildroot/package/gperf/gperf.mk
similarity index 100%
rename from software/package/gperf/gperf.mk
rename to buildroot/package/gperf/gperf.mk
diff --git a/software/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch b/buildroot/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch
similarity index 100%
rename from software/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch
rename to buildroot/package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch
diff --git a/software/package/gpm/0002-Install-unversioned-solibrary.patch b/buildroot/package/gpm/0002-Install-unversioned-solibrary.patch
similarity index 100%
rename from software/package/gpm/0002-Install-unversioned-solibrary.patch
rename to buildroot/package/gpm/0002-Install-unversioned-solibrary.patch
diff --git a/software/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/buildroot/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch
similarity index 100%
rename from software/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch
rename to buildroot/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch
diff --git a/software/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/buildroot/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch
similarity index 100%
rename from software/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch
rename to buildroot/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch
diff --git a/software/package/gpm/0005-fix-building-w-newer-glibc.patch b/buildroot/package/gpm/0005-fix-building-w-newer-glibc.patch
similarity index 100%
rename from software/package/gpm/0005-fix-building-w-newer-glibc.patch
rename to buildroot/package/gpm/0005-fix-building-w-newer-glibc.patch
diff --git a/software/package/gpm/Config.in b/buildroot/package/gpm/Config.in
similarity index 100%
rename from software/package/gpm/Config.in
rename to buildroot/package/gpm/Config.in
diff --git a/software/package/gpm/gpm.hash b/buildroot/package/gpm/gpm.hash
similarity index 100%
rename from software/package/gpm/gpm.hash
rename to buildroot/package/gpm/gpm.hash
diff --git a/software/package/gpm/gpm.mk b/buildroot/package/gpm/gpm.mk
similarity index 100%
rename from software/package/gpm/gpm.mk
rename to buildroot/package/gpm/gpm.mk
diff --git a/software/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch b/buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch
similarity index 100%
rename from software/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch
rename to buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch
diff --git a/software/package/gpsd/Config.in b/buildroot/package/gpsd/Config.in
similarity index 100%
rename from software/package/gpsd/Config.in
rename to buildroot/package/gpsd/Config.in
diff --git a/software/package/gpsd/S50gpsd b/buildroot/package/gpsd/S50gpsd
similarity index 100%
rename from software/package/gpsd/S50gpsd
rename to buildroot/package/gpsd/S50gpsd
diff --git a/software/package/gpsd/gpsd.hash b/buildroot/package/gpsd/gpsd.hash
similarity index 100%
rename from software/package/gpsd/gpsd.hash
rename to buildroot/package/gpsd/gpsd.hash
diff --git a/software/package/gpsd/gpsd.mk b/buildroot/package/gpsd/gpsd.mk
similarity index 100%
rename from software/package/gpsd/gpsd.mk
rename to buildroot/package/gpsd/gpsd.mk
diff --git a/software/package/gptfdisk/0001-ldlibs.patch b/buildroot/package/gptfdisk/0001-ldlibs.patch
similarity index 100%
rename from software/package/gptfdisk/0001-ldlibs.patch
rename to buildroot/package/gptfdisk/0001-ldlibs.patch
diff --git a/software/package/gptfdisk/Config.in b/buildroot/package/gptfdisk/Config.in
similarity index 100%
rename from software/package/gptfdisk/Config.in
rename to buildroot/package/gptfdisk/Config.in
diff --git a/software/package/gptfdisk/Config.in.host b/buildroot/package/gptfdisk/Config.in.host
similarity index 100%
rename from software/package/gptfdisk/Config.in.host
rename to buildroot/package/gptfdisk/Config.in.host
diff --git a/software/package/gptfdisk/gptfdisk.hash b/buildroot/package/gptfdisk/gptfdisk.hash
similarity index 100%
rename from software/package/gptfdisk/gptfdisk.hash
rename to buildroot/package/gptfdisk/gptfdisk.hash
diff --git a/software/package/gptfdisk/gptfdisk.mk b/buildroot/package/gptfdisk/gptfdisk.mk
similarity index 100%
rename from software/package/gptfdisk/gptfdisk.mk
rename to buildroot/package/gptfdisk/gptfdisk.mk
diff --git a/software/package/gqrx/Config.in b/buildroot/package/gqrx/Config.in
similarity index 100%
rename from software/package/gqrx/Config.in
rename to buildroot/package/gqrx/Config.in
diff --git a/software/package/gqrx/gqrx.hash b/buildroot/package/gqrx/gqrx.hash
similarity index 100%
rename from software/package/gqrx/gqrx.hash
rename to buildroot/package/gqrx/gqrx.hash
diff --git a/software/package/gqrx/gqrx.mk b/buildroot/package/gqrx/gqrx.mk
similarity index 100%
rename from software/package/gqrx/gqrx.mk
rename to buildroot/package/gqrx/gqrx.mk
diff --git a/software/package/gqview/0001-make.patch b/buildroot/package/gqview/0001-make.patch
similarity index 100%
rename from software/package/gqview/0001-make.patch
rename to buildroot/package/gqview/0001-make.patch
diff --git a/software/package/gqview/Config.in b/buildroot/package/gqview/Config.in
similarity index 100%
rename from software/package/gqview/Config.in
rename to buildroot/package/gqview/Config.in
diff --git a/software/package/gqview/gqview.hash b/buildroot/package/gqview/gqview.hash
similarity index 100%
rename from software/package/gqview/gqview.hash
rename to buildroot/package/gqview/gqview.hash
diff --git a/software/package/gqview/gqview.mk b/buildroot/package/gqview/gqview.mk
similarity index 100%
rename from software/package/gqview/gqview.mk
rename to buildroot/package/gqview/gqview.mk
diff --git a/software/package/gr-osmosdr/Config.in b/buildroot/package/gr-osmosdr/Config.in
similarity index 100%
rename from software/package/gr-osmosdr/Config.in
rename to buildroot/package/gr-osmosdr/Config.in
diff --git a/software/package/gr-osmosdr/gr-osmosdr.hash b/buildroot/package/gr-osmosdr/gr-osmosdr.hash
similarity index 100%
rename from software/package/gr-osmosdr/gr-osmosdr.hash
rename to buildroot/package/gr-osmosdr/gr-osmosdr.hash
diff --git a/software/package/gr-osmosdr/gr-osmosdr.mk b/buildroot/package/gr-osmosdr/gr-osmosdr.mk
similarity index 100%
rename from software/package/gr-osmosdr/gr-osmosdr.mk
rename to buildroot/package/gr-osmosdr/gr-osmosdr.mk
diff --git a/software/package/granite/Config.in b/buildroot/package/granite/Config.in
similarity index 100%
rename from software/package/granite/Config.in
rename to buildroot/package/granite/Config.in
diff --git a/software/package/granite/granite.hash b/buildroot/package/granite/granite.hash
similarity index 100%
rename from software/package/granite/granite.hash
rename to buildroot/package/granite/granite.hash
diff --git a/software/package/granite/granite.mk b/buildroot/package/granite/granite.mk
similarity index 100%
rename from software/package/granite/granite.mk
rename to buildroot/package/granite/granite.mk
diff --git a/software/package/grantlee/0001-Remove-vestigial-ansi-flag.patch b/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch
similarity index 100%
rename from software/package/grantlee/0001-Remove-vestigial-ansi-flag.patch
rename to buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch
diff --git a/software/package/grantlee/Config.in b/buildroot/package/grantlee/Config.in
similarity index 100%
rename from software/package/grantlee/Config.in
rename to buildroot/package/grantlee/Config.in
diff --git a/software/package/grantlee/grantlee.hash b/buildroot/package/grantlee/grantlee.hash
similarity index 100%
rename from software/package/grantlee/grantlee.hash
rename to buildroot/package/grantlee/grantlee.hash
diff --git a/software/package/grantlee/grantlee.mk b/buildroot/package/grantlee/grantlee.mk
similarity index 100%
rename from software/package/grantlee/grantlee.mk
rename to buildroot/package/grantlee/grantlee.mk
diff --git a/software/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch b/buildroot/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch
similarity index 100%
rename from software/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch
rename to buildroot/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch
diff --git a/software/package/graphite2/Config.in b/buildroot/package/graphite2/Config.in
similarity index 100%
rename from software/package/graphite2/Config.in
rename to buildroot/package/graphite2/Config.in
diff --git a/software/package/graphite2/graphite2.hash b/buildroot/package/graphite2/graphite2.hash
similarity index 100%
rename from software/package/graphite2/graphite2.hash
rename to buildroot/package/graphite2/graphite2.hash
diff --git a/software/package/graphite2/graphite2.mk b/buildroot/package/graphite2/graphite2.mk
similarity index 100%
rename from software/package/graphite2/graphite2.mk
rename to buildroot/package/graphite2/graphite2.mk
diff --git a/software/package/grep/Config.in b/buildroot/package/grep/Config.in
similarity index 100%
rename from software/package/grep/Config.in
rename to buildroot/package/grep/Config.in
diff --git a/software/package/grep/grep.hash b/buildroot/package/grep/grep.hash
similarity index 100%
rename from software/package/grep/grep.hash
rename to buildroot/package/grep/grep.hash
diff --git a/software/package/grep/grep.mk b/buildroot/package/grep/grep.mk
similarity index 100%
rename from software/package/grep/grep.mk
rename to buildroot/package/grep/grep.mk
diff --git a/software/package/grpc/0001-target-build-using-host-plugin.patch b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch
similarity index 100%
rename from software/package/grpc/0001-target-build-using-host-plugin.patch
rename to buildroot/package/grpc/0001-target-build-using-host-plugin.patch
diff --git a/software/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch
similarity index 100%
rename from software/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch
rename to buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch
diff --git a/software/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch b/buildroot/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch
similarity index 100%
rename from software/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch
rename to buildroot/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch
diff --git a/software/package/grpc/Config.in b/buildroot/package/grpc/Config.in
similarity index 100%
rename from software/package/grpc/Config.in
rename to buildroot/package/grpc/Config.in
diff --git a/software/package/grpc/grpc.hash b/buildroot/package/grpc/grpc.hash
similarity index 100%
rename from software/package/grpc/grpc.hash
rename to buildroot/package/grpc/grpc.hash
diff --git a/software/package/grpc/grpc.mk b/buildroot/package/grpc/grpc.mk
similarity index 100%
rename from software/package/grpc/grpc.mk
rename to buildroot/package/grpc/grpc.mk
diff --git a/software/package/gsettings-desktop-schemas/Config.in b/buildroot/package/gsettings-desktop-schemas/Config.in
similarity index 100%
rename from software/package/gsettings-desktop-schemas/Config.in
rename to buildroot/package/gsettings-desktop-schemas/Config.in
diff --git a/software/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash
similarity index 100%
rename from software/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash
rename to buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash
diff --git a/software/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
similarity index 100%
rename from software/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
rename to buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
diff --git a/software/package/gsl/Config.in b/buildroot/package/gsl/Config.in
similarity index 100%
rename from software/package/gsl/Config.in
rename to buildroot/package/gsl/Config.in
diff --git a/software/package/gsl/gsl.hash b/buildroot/package/gsl/gsl.hash
similarity index 100%
rename from software/package/gsl/gsl.hash
rename to buildroot/package/gsl/gsl.hash
diff --git a/software/package/gsl/gsl.mk b/buildroot/package/gsl/gsl.mk
similarity index 100%
rename from software/package/gsl/gsl.mk
rename to buildroot/package/gsl/gsl.mk
diff --git a/software/package/gssdp/Config.in b/buildroot/package/gssdp/Config.in
similarity index 100%
rename from software/package/gssdp/Config.in
rename to buildroot/package/gssdp/Config.in
diff --git a/software/package/gssdp/gssdp.hash b/buildroot/package/gssdp/gssdp.hash
similarity index 100%
rename from software/package/gssdp/gssdp.hash
rename to buildroot/package/gssdp/gssdp.hash
diff --git a/software/package/gssdp/gssdp.mk b/buildroot/package/gssdp/gssdp.mk
similarity index 100%
rename from software/package/gssdp/gssdp.mk
rename to buildroot/package/gssdp/gssdp.mk
diff --git a/software/package/gstreamer1/Config.in b/buildroot/package/gstreamer1/Config.in
similarity index 100%
rename from software/package/gstreamer1/Config.in
rename to buildroot/package/gstreamer1/Config.in
diff --git a/software/package/gstreamer1/gst-omx/Config.in b/buildroot/package/gstreamer1/gst-omx/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst-omx/Config.in
rename to buildroot/package/gstreamer1/gst-omx/Config.in
diff --git a/software/package/gstreamer1/gst-omx/gst-omx.hash b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash
similarity index 100%
rename from software/package/gstreamer1/gst-omx/gst-omx.hash
rename to buildroot/package/gstreamer1/gst-omx/gst-omx.hash
diff --git a/software/package/gstreamer1/gst-omx/gst-omx.mk b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
similarity index 100%
rename from software/package/gstreamer1/gst-omx/gst-omx.mk
rename to buildroot/package/gstreamer1/gst-omx/gst-omx.mk
diff --git a/software/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch b/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch
similarity index 100%
rename from software/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch
rename to buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch
diff --git a/software/package/gstreamer1/gst1-imx/Config.in b/buildroot/package/gstreamer1/gst1-imx/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-imx/Config.in
rename to buildroot/package/gstreamer1/gst1-imx/Config.in
diff --git a/software/package/gstreamer1/gst1-imx/gst1-imx.hash b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-imx/gst1-imx.hash
rename to buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash
diff --git a/software/package/gstreamer1/gst1-imx/gst1-imx.mk b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-imx/gst1-imx.mk
rename to buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk
diff --git a/software/package/gstreamer1/gst1-interpipe/Config.in b/buildroot/package/gstreamer1/gst1-interpipe/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-interpipe/Config.in
rename to buildroot/package/gstreamer1/gst1-interpipe/Config.in
diff --git a/software/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash
rename to buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash
diff --git a/software/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk
rename to buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk
diff --git a/software/package/gstreamer1/gst1-libav/Config.in b/buildroot/package/gstreamer1/gst1-libav/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-libav/Config.in
rename to buildroot/package/gstreamer1/gst1-libav/Config.in
diff --git a/software/package/gstreamer1/gst1-libav/gst1-libav.hash b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-libav/gst1-libav.hash
rename to buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash
diff --git a/software/package/gstreamer1/gst1-libav/gst1-libav.mk b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-libav/gst1-libav.mk
rename to buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk
diff --git a/software/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch b/buildroot/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch
rename to buildroot/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch
diff --git a/software/package/gstreamer1/gst1-plugins-bad/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bad/Config.in
rename to buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
diff --git a/software/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
rename to buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
diff --git a/software/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
rename to buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
diff --git a/software/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch b/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch
rename to buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch
diff --git a/software/package/gstreamer1/gst1-plugins-base/Config.in b/buildroot/package/gstreamer1/gst1-plugins-base/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-base/Config.in
rename to buildroot/package/gstreamer1/gst1-plugins-base/Config.in
diff --git a/software/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
rename to buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
diff --git a/software/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
rename to buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
diff --git a/software/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in
rename to buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in
diff --git a/software/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
rename to buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
diff --git a/software/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
rename to buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
diff --git a/software/package/gstreamer1/gst1-plugins-good/Config.in b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-good/Config.in
rename to buildroot/package/gstreamer1/gst1-plugins-good/Config.in
diff --git a/software/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
rename to buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
diff --git a/software/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
rename to buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
diff --git a/software/package/gstreamer1/gst1-plugins-ugly/Config.in b/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-ugly/Config.in
rename to buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in
diff --git a/software/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
rename to buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
diff --git a/software/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
rename to buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
diff --git a/software/package/gstreamer1/gst1-rtsp-server/Config.in b/buildroot/package/gstreamer1/gst1-rtsp-server/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-rtsp-server/Config.in
rename to buildroot/package/gstreamer1/gst1-rtsp-server/Config.in
diff --git a/software/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
rename to buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
diff --git a/software/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
rename to buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
diff --git a/software/package/gstreamer1/gst1-shark/Config.in b/buildroot/package/gstreamer1/gst1-shark/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-shark/Config.in
rename to buildroot/package/gstreamer1/gst1-shark/Config.in
diff --git a/software/package/gstreamer1/gst1-shark/gst1-shark.hash b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-shark/gst1-shark.hash
rename to buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash
diff --git a/software/package/gstreamer1/gst1-shark/gst1-shark.mk b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-shark/gst1-shark.mk
rename to buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk
diff --git a/software/package/gstreamer1/gst1-vaapi/Config.in b/buildroot/package/gstreamer1/gst1-vaapi/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-vaapi/Config.in
rename to buildroot/package/gstreamer1/gst1-vaapi/Config.in
diff --git a/software/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash
rename to buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash
diff --git a/software/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
rename to buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
diff --git a/software/package/gstreamer1/gst1-validate/Config.in b/buildroot/package/gstreamer1/gst1-validate/Config.in
similarity index 100%
rename from software/package/gstreamer1/gst1-validate/Config.in
rename to buildroot/package/gstreamer1/gst1-validate/Config.in
diff --git a/software/package/gstreamer1/gst1-validate/gst1-validate.hash b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash
similarity index 100%
rename from software/package/gstreamer1/gst1-validate/gst1-validate.hash
rename to buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash
diff --git a/software/package/gstreamer1/gst1-validate/gst1-validate.mk b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk
similarity index 100%
rename from software/package/gstreamer1/gst1-validate/gst1-validate.mk
rename to buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk
diff --git a/software/package/gstreamer1/gstreamer1-editing-services/Config.in b/buildroot/package/gstreamer1/gstreamer1-editing-services/Config.in
similarity index 100%
rename from software/package/gstreamer1/gstreamer1-editing-services/Config.in
rename to buildroot/package/gstreamer1/gstreamer1-editing-services/Config.in
diff --git a/software/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash
similarity index 100%
rename from software/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash
rename to buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash
diff --git a/software/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk
similarity index 100%
rename from software/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk
rename to buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk
diff --git a/software/package/gstreamer1/gstreamer1-mm/Config.in b/buildroot/package/gstreamer1/gstreamer1-mm/Config.in
similarity index 100%
rename from software/package/gstreamer1/gstreamer1-mm/Config.in
rename to buildroot/package/gstreamer1/gstreamer1-mm/Config.in
diff --git a/software/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash b/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash
similarity index 100%
rename from software/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash
rename to buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash
diff --git a/software/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk b/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk
similarity index 100%
rename from software/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk
rename to buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk
diff --git a/software/package/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1.mk
similarity index 100%
rename from software/package/gstreamer1/gstreamer1.mk
rename to buildroot/package/gstreamer1/gstreamer1.mk
diff --git a/software/package/gstreamer1/gstreamer1/Config.in b/buildroot/package/gstreamer1/gstreamer1/Config.in
similarity index 100%
rename from software/package/gstreamer1/gstreamer1/Config.in
rename to buildroot/package/gstreamer1/gstreamer1/Config.in
diff --git a/software/package/gstreamer1/gstreamer1/gstreamer1.hash b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash
similarity index 100%
rename from software/package/gstreamer1/gstreamer1/gstreamer1.hash
rename to buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash
diff --git a/software/package/gstreamer1/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk
similarity index 100%
rename from software/package/gstreamer1/gstreamer1/gstreamer1.mk
rename to buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk
diff --git a/software/package/gtest/Config.in b/buildroot/package/gtest/Config.in
similarity index 100%
rename from software/package/gtest/Config.in
rename to buildroot/package/gtest/Config.in
diff --git a/software/package/gtest/gtest.hash b/buildroot/package/gtest/gtest.hash
similarity index 100%
rename from software/package/gtest/gtest.hash
rename to buildroot/package/gtest/gtest.hash
diff --git a/software/package/gtest/gtest.mk b/buildroot/package/gtest/gtest.mk
similarity index 100%
rename from software/package/gtest/gtest.mk
rename to buildroot/package/gtest/gtest.mk
diff --git a/software/package/gtk2-engines/Config.in b/buildroot/package/gtk2-engines/Config.in
similarity index 100%
rename from software/package/gtk2-engines/Config.in
rename to buildroot/package/gtk2-engines/Config.in
diff --git a/software/package/gtk2-engines/gtk2-engines.hash b/buildroot/package/gtk2-engines/gtk2-engines.hash
similarity index 100%
rename from software/package/gtk2-engines/gtk2-engines.hash
rename to buildroot/package/gtk2-engines/gtk2-engines.hash
diff --git a/software/package/gtk2-engines/gtk2-engines.mk b/buildroot/package/gtk2-engines/gtk2-engines.mk
similarity index 100%
rename from software/package/gtk2-engines/gtk2-engines.mk
rename to buildroot/package/gtk2-engines/gtk2-engines.mk
diff --git a/software/package/gtkmm3/Config.in b/buildroot/package/gtkmm3/Config.in
similarity index 100%
rename from software/package/gtkmm3/Config.in
rename to buildroot/package/gtkmm3/Config.in
diff --git a/software/package/gtkmm3/gtkmm3.hash b/buildroot/package/gtkmm3/gtkmm3.hash
similarity index 100%
rename from software/package/gtkmm3/gtkmm3.hash
rename to buildroot/package/gtkmm3/gtkmm3.hash
diff --git a/software/package/gtkmm3/gtkmm3.mk b/buildroot/package/gtkmm3/gtkmm3.mk
similarity index 100%
rename from software/package/gtkmm3/gtkmm3.mk
rename to buildroot/package/gtkmm3/gtkmm3.mk
diff --git a/software/package/gtkperf/Config.in b/buildroot/package/gtkperf/Config.in
similarity index 100%
rename from software/package/gtkperf/Config.in
rename to buildroot/package/gtkperf/Config.in
diff --git a/software/package/gtkperf/gtkperf.hash b/buildroot/package/gtkperf/gtkperf.hash
similarity index 100%
rename from software/package/gtkperf/gtkperf.hash
rename to buildroot/package/gtkperf/gtkperf.hash
diff --git a/software/package/gtkperf/gtkperf.mk b/buildroot/package/gtkperf/gtkperf.mk
similarity index 100%
rename from software/package/gtkperf/gtkperf.mk
rename to buildroot/package/gtkperf/gtkperf.mk
diff --git a/software/package/gtksourceview/Config.in b/buildroot/package/gtksourceview/Config.in
similarity index 100%
rename from software/package/gtksourceview/Config.in
rename to buildroot/package/gtksourceview/Config.in
diff --git a/software/package/gtksourceview/gtksourceview.hash b/buildroot/package/gtksourceview/gtksourceview.hash
similarity index 100%
rename from software/package/gtksourceview/gtksourceview.hash
rename to buildroot/package/gtksourceview/gtksourceview.hash
diff --git a/software/package/gtksourceview/gtksourceview.mk b/buildroot/package/gtksourceview/gtksourceview.mk
similarity index 100%
rename from software/package/gtksourceview/gtksourceview.mk
rename to buildroot/package/gtksourceview/gtksourceview.mk
diff --git a/software/package/guile/0001-fix_arm_endianness.patch b/buildroot/package/guile/0001-fix_arm_endianness.patch
similarity index 100%
rename from software/package/guile/0001-fix_arm_endianness.patch
rename to buildroot/package/guile/0001-fix_arm_endianness.patch
diff --git a/software/package/guile/0002-calculate-csqrt_manually.patch b/buildroot/package/guile/0002-calculate-csqrt_manually.patch
similarity index 100%
rename from software/package/guile/0002-calculate-csqrt_manually.patch
rename to buildroot/package/guile/0002-calculate-csqrt_manually.patch
diff --git a/software/package/guile/0003-workaround-ice-ssa-corruption.patch b/buildroot/package/guile/0003-workaround-ice-ssa-corruption.patch
similarity index 100%
rename from software/package/guile/0003-workaround-ice-ssa-corruption.patch
rename to buildroot/package/guile/0003-workaround-ice-ssa-corruption.patch
diff --git a/software/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch b/buildroot/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch
similarity index 100%
rename from software/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch
rename to buildroot/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch
diff --git a/software/package/guile/Config.in b/buildroot/package/guile/Config.in
similarity index 100%
rename from software/package/guile/Config.in
rename to buildroot/package/guile/Config.in
diff --git a/software/package/guile/guile.hash b/buildroot/package/guile/guile.hash
similarity index 100%
rename from software/package/guile/guile.hash
rename to buildroot/package/guile/guile.hash
diff --git a/software/package/guile/guile.mk b/buildroot/package/guile/guile.mk
similarity index 100%
rename from software/package/guile/guile.mk
rename to buildroot/package/guile/guile.mk
diff --git a/software/package/gupnp-av/Config.in b/buildroot/package/gupnp-av/Config.in
similarity index 100%
rename from software/package/gupnp-av/Config.in
rename to buildroot/package/gupnp-av/Config.in
diff --git a/software/package/gupnp-av/gupnp-av.hash b/buildroot/package/gupnp-av/gupnp-av.hash
similarity index 100%
rename from software/package/gupnp-av/gupnp-av.hash
rename to buildroot/package/gupnp-av/gupnp-av.hash
diff --git a/software/package/gupnp-av/gupnp-av.mk b/buildroot/package/gupnp-av/gupnp-av.mk
similarity index 100%
rename from software/package/gupnp-av/gupnp-av.mk
rename to buildroot/package/gupnp-av/gupnp-av.mk
diff --git a/software/package/gupnp-dlna/Config.in b/buildroot/package/gupnp-dlna/Config.in
similarity index 100%
rename from software/package/gupnp-dlna/Config.in
rename to buildroot/package/gupnp-dlna/Config.in
diff --git a/software/package/gupnp-dlna/gupnp-dlna.hash b/buildroot/package/gupnp-dlna/gupnp-dlna.hash
similarity index 100%
rename from software/package/gupnp-dlna/gupnp-dlna.hash
rename to buildroot/package/gupnp-dlna/gupnp-dlna.hash
diff --git a/software/package/gupnp-dlna/gupnp-dlna.mk b/buildroot/package/gupnp-dlna/gupnp-dlna.mk
similarity index 100%
rename from software/package/gupnp-dlna/gupnp-dlna.mk
rename to buildroot/package/gupnp-dlna/gupnp-dlna.mk
diff --git a/software/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch b/buildroot/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch
similarity index 100%
rename from software/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch
rename to buildroot/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch
diff --git a/software/package/gupnp-tools/Config.in b/buildroot/package/gupnp-tools/Config.in
similarity index 100%
rename from software/package/gupnp-tools/Config.in
rename to buildroot/package/gupnp-tools/Config.in
diff --git a/software/package/gupnp-tools/gupnp-tools.hash b/buildroot/package/gupnp-tools/gupnp-tools.hash
similarity index 100%
rename from software/package/gupnp-tools/gupnp-tools.hash
rename to buildroot/package/gupnp-tools/gupnp-tools.hash
diff --git a/software/package/gupnp-tools/gupnp-tools.mk b/buildroot/package/gupnp-tools/gupnp-tools.mk
similarity index 100%
rename from software/package/gupnp-tools/gupnp-tools.mk
rename to buildroot/package/gupnp-tools/gupnp-tools.mk
diff --git a/software/package/gupnp/Config.in b/buildroot/package/gupnp/Config.in
similarity index 100%
rename from software/package/gupnp/Config.in
rename to buildroot/package/gupnp/Config.in
diff --git a/software/package/gupnp/gupnp.hash b/buildroot/package/gupnp/gupnp.hash
similarity index 100%
rename from software/package/gupnp/gupnp.hash
rename to buildroot/package/gupnp/gupnp.hash
diff --git a/software/package/gupnp/gupnp.mk b/buildroot/package/gupnp/gupnp.mk
similarity index 100%
rename from software/package/gupnp/gupnp.mk
rename to buildroot/package/gupnp/gupnp.mk
diff --git a/software/package/gutenprint/0001-use-pregen-xmli18n-header.patch b/buildroot/package/gutenprint/0001-use-pregen-xmli18n-header.patch
similarity index 100%
rename from software/package/gutenprint/0001-use-pregen-xmli18n-header.patch
rename to buildroot/package/gutenprint/0001-use-pregen-xmli18n-header.patch
diff --git a/software/package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch b/buildroot/package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch
similarity index 100%
rename from software/package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch
rename to buildroot/package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch
diff --git a/software/package/gutenprint/Config.in b/buildroot/package/gutenprint/Config.in
similarity index 100%
rename from software/package/gutenprint/Config.in
rename to buildroot/package/gutenprint/Config.in
diff --git a/software/package/gutenprint/gutenprint.hash b/buildroot/package/gutenprint/gutenprint.hash
similarity index 100%
rename from software/package/gutenprint/gutenprint.hash
rename to buildroot/package/gutenprint/gutenprint.hash
diff --git a/software/package/gutenprint/gutenprint.mk b/buildroot/package/gutenprint/gutenprint.mk
similarity index 100%
rename from software/package/gutenprint/gutenprint.mk
rename to buildroot/package/gutenprint/gutenprint.mk
diff --git a/software/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch b/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch
similarity index 100%
rename from software/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch
rename to buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch
diff --git a/software/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch b/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch
similarity index 100%
rename from software/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch
rename to buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch
diff --git a/software/package/gvfs/0003-admin-Allow-changing-file-owner.patch b/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch
similarity index 100%
rename from software/package/gvfs/0003-admin-Allow-changing-file-owner.patch
rename to buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch
diff --git a/software/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch b/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch
similarity index 100%
rename from software/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch
rename to buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch
diff --git a/software/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch b/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch
similarity index 100%
rename from software/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch
rename to buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch
diff --git a/software/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch b/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch
similarity index 100%
rename from software/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch
rename to buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch
diff --git a/software/package/gvfs/Config.in b/buildroot/package/gvfs/Config.in
similarity index 100%
rename from software/package/gvfs/Config.in
rename to buildroot/package/gvfs/Config.in
diff --git a/software/package/gvfs/gvfs.hash b/buildroot/package/gvfs/gvfs.hash
similarity index 100%
rename from software/package/gvfs/gvfs.hash
rename to buildroot/package/gvfs/gvfs.hash
diff --git a/software/package/gvfs/gvfs.mk b/buildroot/package/gvfs/gvfs.mk
similarity index 100%
rename from software/package/gvfs/gvfs.mk
rename to buildroot/package/gvfs/gvfs.mk
diff --git a/software/package/gzip/Config.in b/buildroot/package/gzip/Config.in
similarity index 100%
rename from software/package/gzip/Config.in
rename to buildroot/package/gzip/Config.in
diff --git a/software/package/gzip/gzip.hash b/buildroot/package/gzip/gzip.hash
similarity index 100%
rename from software/package/gzip/gzip.hash
rename to buildroot/package/gzip/gzip.hash
diff --git a/software/package/gzip/gzip.mk b/buildroot/package/gzip/gzip.mk
similarity index 100%
rename from software/package/gzip/gzip.mk
rename to buildroot/package/gzip/gzip.mk
diff --git a/software/package/hackrf/0001-Don-t-require-a-C-compiler.patch b/buildroot/package/hackrf/0001-Don-t-require-a-C-compiler.patch
similarity index 100%
rename from software/package/hackrf/0001-Don-t-require-a-C-compiler.patch
rename to buildroot/package/hackrf/0001-Don-t-require-a-C-compiler.patch
diff --git a/software/package/hackrf/Config.in b/buildroot/package/hackrf/Config.in
similarity index 100%
rename from software/package/hackrf/Config.in
rename to buildroot/package/hackrf/Config.in
diff --git a/software/package/hackrf/hackrf.hash b/buildroot/package/hackrf/hackrf.hash
similarity index 100%
rename from software/package/hackrf/hackrf.hash
rename to buildroot/package/hackrf/hackrf.hash
diff --git a/software/package/hackrf/hackrf.mk b/buildroot/package/hackrf/hackrf.mk
similarity index 100%
rename from software/package/hackrf/hackrf.mk
rename to buildroot/package/hackrf/hackrf.mk
diff --git a/software/package/hans/Config.in b/buildroot/package/hans/Config.in
similarity index 100%
rename from software/package/hans/Config.in
rename to buildroot/package/hans/Config.in
diff --git a/software/package/hans/hans.hash b/buildroot/package/hans/hans.hash
similarity index 100%
rename from software/package/hans/hans.hash
rename to buildroot/package/hans/hans.hash
diff --git a/software/package/hans/hans.mk b/buildroot/package/hans/hans.mk
similarity index 100%
rename from software/package/hans/hans.mk
rename to buildroot/package/hans/hans.mk
diff --git a/software/package/haproxy/Config.in b/buildroot/package/haproxy/Config.in
similarity index 100%
rename from software/package/haproxy/Config.in
rename to buildroot/package/haproxy/Config.in
diff --git a/software/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash
similarity index 100%
rename from software/package/haproxy/haproxy.hash
rename to buildroot/package/haproxy/haproxy.hash
diff --git a/software/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk
similarity index 100%
rename from software/package/haproxy/haproxy.mk
rename to buildroot/package/haproxy/haproxy.mk
diff --git a/software/package/harfbuzz/Config.in b/buildroot/package/harfbuzz/Config.in
similarity index 100%
rename from software/package/harfbuzz/Config.in
rename to buildroot/package/harfbuzz/Config.in
diff --git a/software/package/harfbuzz/harfbuzz.hash b/buildroot/package/harfbuzz/harfbuzz.hash
similarity index 100%
rename from software/package/harfbuzz/harfbuzz.hash
rename to buildroot/package/harfbuzz/harfbuzz.hash
diff --git a/software/package/harfbuzz/harfbuzz.mk b/buildroot/package/harfbuzz/harfbuzz.mk
similarity index 100%
rename from software/package/harfbuzz/harfbuzz.mk
rename to buildroot/package/harfbuzz/harfbuzz.mk
diff --git a/software/package/haserl/0001-add-haserl_lualib.inc.patch b/buildroot/package/haserl/0001-add-haserl_lualib.inc.patch
similarity index 100%
rename from software/package/haserl/0001-add-haserl_lualib.inc.patch
rename to buildroot/package/haserl/0001-add-haserl_lualib.inc.patch
diff --git a/software/package/haserl/Config.in b/buildroot/package/haserl/Config.in
similarity index 100%
rename from software/package/haserl/Config.in
rename to buildroot/package/haserl/Config.in
diff --git a/software/package/haserl/haserl.hash b/buildroot/package/haserl/haserl.hash
similarity index 100%
rename from software/package/haserl/haserl.hash
rename to buildroot/package/haserl/haserl.hash
diff --git a/software/package/haserl/haserl.mk b/buildroot/package/haserl/haserl.mk
similarity index 100%
rename from software/package/haserl/haserl.mk
rename to buildroot/package/haserl/haserl.mk
diff --git a/software/package/haveged/Config.in b/buildroot/package/haveged/Config.in
similarity index 100%
rename from software/package/haveged/Config.in
rename to buildroot/package/haveged/Config.in
diff --git a/software/package/haveged/S21haveged b/buildroot/package/haveged/S21haveged
similarity index 100%
rename from software/package/haveged/S21haveged
rename to buildroot/package/haveged/S21haveged
diff --git a/software/package/haveged/haveged.hash b/buildroot/package/haveged/haveged.hash
similarity index 100%
rename from software/package/haveged/haveged.hash
rename to buildroot/package/haveged/haveged.hash
diff --git a/software/package/haveged/haveged.mk b/buildroot/package/haveged/haveged.mk
similarity index 100%
rename from software/package/haveged/haveged.mk
rename to buildroot/package/haveged/haveged.mk
diff --git a/software/package/haveged/haveged.service b/buildroot/package/haveged/haveged.service
similarity index 100%
rename from software/package/haveged/haveged.service
rename to buildroot/package/haveged/haveged.service
diff --git a/software/package/hdparm/Config.in b/buildroot/package/hdparm/Config.in
similarity index 100%
rename from software/package/hdparm/Config.in
rename to buildroot/package/hdparm/Config.in
diff --git a/software/package/hdparm/hdparm.hash b/buildroot/package/hdparm/hdparm.hash
similarity index 100%
rename from software/package/hdparm/hdparm.hash
rename to buildroot/package/hdparm/hdparm.hash
diff --git a/software/package/hdparm/hdparm.mk b/buildroot/package/hdparm/hdparm.mk
similarity index 100%
rename from software/package/hdparm/hdparm.mk
rename to buildroot/package/hdparm/hdparm.mk
diff --git a/software/package/heimdal/heimdal.hash b/buildroot/package/heimdal/heimdal.hash
similarity index 100%
rename from software/package/heimdal/heimdal.hash
rename to buildroot/package/heimdal/heimdal.hash
diff --git a/software/package/heimdal/heimdal.mk b/buildroot/package/heimdal/heimdal.mk
similarity index 100%
rename from software/package/heimdal/heimdal.mk
rename to buildroot/package/heimdal/heimdal.mk
diff --git a/software/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/buildroot/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
similarity index 100%
rename from software/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
rename to buildroot/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
diff --git a/software/package/heirloom-mailx/0002-fix-libressl-support.patch b/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch
similarity index 100%
rename from software/package/heirloom-mailx/0002-fix-libressl-support.patch
rename to buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch
diff --git a/software/package/heirloom-mailx/Config.in b/buildroot/package/heirloom-mailx/Config.in
similarity index 100%
rename from software/package/heirloom-mailx/Config.in
rename to buildroot/package/heirloom-mailx/Config.in
diff --git a/software/package/heirloom-mailx/heirloom-mailx.hash b/buildroot/package/heirloom-mailx/heirloom-mailx.hash
similarity index 100%
rename from software/package/heirloom-mailx/heirloom-mailx.hash
rename to buildroot/package/heirloom-mailx/heirloom-mailx.hash
diff --git a/software/package/heirloom-mailx/heirloom-mailx.mk b/buildroot/package/heirloom-mailx/heirloom-mailx.mk
similarity index 100%
rename from software/package/heirloom-mailx/heirloom-mailx.mk
rename to buildroot/package/heirloom-mailx/heirloom-mailx.mk
diff --git a/software/package/hiawatha/Config.in b/buildroot/package/hiawatha/Config.in
similarity index 100%
rename from software/package/hiawatha/Config.in
rename to buildroot/package/hiawatha/Config.in
diff --git a/software/package/hiawatha/hiawatha.hash b/buildroot/package/hiawatha/hiawatha.hash
similarity index 100%
rename from software/package/hiawatha/hiawatha.hash
rename to buildroot/package/hiawatha/hiawatha.hash
diff --git a/software/package/hiawatha/hiawatha.mk b/buildroot/package/hiawatha/hiawatha.mk
similarity index 100%
rename from software/package/hiawatha/hiawatha.mk
rename to buildroot/package/hiawatha/hiawatha.mk
diff --git a/software/package/hicolor-icon-theme/Config.in b/buildroot/package/hicolor-icon-theme/Config.in
similarity index 100%
rename from software/package/hicolor-icon-theme/Config.in
rename to buildroot/package/hicolor-icon-theme/Config.in
diff --git a/software/package/hicolor-icon-theme/hicolor-icon-theme.hash b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash
similarity index 100%
rename from software/package/hicolor-icon-theme/hicolor-icon-theme.hash
rename to buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash
diff --git a/software/package/hicolor-icon-theme/hicolor-icon-theme.mk b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk
similarity index 100%
rename from software/package/hicolor-icon-theme/hicolor-icon-theme.mk
rename to buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk
diff --git a/software/package/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch b/buildroot/package/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch
similarity index 100%
rename from software/package/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch
rename to buildroot/package/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch
diff --git a/software/package/hidapi/Config.in b/buildroot/package/hidapi/Config.in
similarity index 100%
rename from software/package/hidapi/Config.in
rename to buildroot/package/hidapi/Config.in
diff --git a/software/package/hidapi/hidapi.hash b/buildroot/package/hidapi/hidapi.hash
similarity index 100%
rename from software/package/hidapi/hidapi.hash
rename to buildroot/package/hidapi/hidapi.hash
diff --git a/software/package/hidapi/hidapi.mk b/buildroot/package/hidapi/hidapi.mk
similarity index 100%
rename from software/package/hidapi/hidapi.mk
rename to buildroot/package/hidapi/hidapi.mk
diff --git a/software/package/hiredis/Config.in b/buildroot/package/hiredis/Config.in
similarity index 100%
rename from software/package/hiredis/Config.in
rename to buildroot/package/hiredis/Config.in
diff --git a/software/package/hiredis/hiredis.hash b/buildroot/package/hiredis/hiredis.hash
similarity index 100%
rename from software/package/hiredis/hiredis.hash
rename to buildroot/package/hiredis/hiredis.hash
diff --git a/software/package/hiredis/hiredis.mk b/buildroot/package/hiredis/hiredis.mk
similarity index 100%
rename from software/package/hiredis/hiredis.mk
rename to buildroot/package/hiredis/hiredis.mk
diff --git a/software/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/buildroot/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
similarity index 100%
rename from software/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
rename to buildroot/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
diff --git a/software/package/hostapd/Config.in b/buildroot/package/hostapd/Config.in
similarity index 100%
rename from software/package/hostapd/Config.in
rename to buildroot/package/hostapd/Config.in
diff --git a/software/package/hostapd/hostapd.hash b/buildroot/package/hostapd/hostapd.hash
similarity index 100%
rename from software/package/hostapd/hostapd.hash
rename to buildroot/package/hostapd/hostapd.hash
diff --git a/software/package/hostapd/hostapd.mk b/buildroot/package/hostapd/hostapd.mk
similarity index 100%
rename from software/package/hostapd/hostapd.mk
rename to buildroot/package/hostapd/hostapd.mk
diff --git a/software/package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch b/buildroot/package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch
similarity index 100%
rename from software/package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch
rename to buildroot/package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch
diff --git a/software/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch b/buildroot/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch
similarity index 100%
rename from software/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch
rename to buildroot/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch
diff --git a/software/package/hplip/Config.in b/buildroot/package/hplip/Config.in
similarity index 100%
rename from software/package/hplip/Config.in
rename to buildroot/package/hplip/Config.in
diff --git a/software/package/hplip/hplip.hash b/buildroot/package/hplip/hplip.hash
similarity index 100%
rename from software/package/hplip/hplip.hash
rename to buildroot/package/hplip/hplip.hash
diff --git a/software/package/hplip/hplip.mk b/buildroot/package/hplip/hplip.mk
similarity index 100%
rename from software/package/hplip/hplip.mk
rename to buildroot/package/hplip/hplip.mk
diff --git a/software/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch b/buildroot/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch
similarity index 100%
rename from software/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch
rename to buildroot/package/htop/0001-MetersPanel-remove-0xe2-from-MetersPanel.c.patch
diff --git a/software/package/htop/Config.in b/buildroot/package/htop/Config.in
similarity index 100%
rename from software/package/htop/Config.in
rename to buildroot/package/htop/Config.in
diff --git a/software/package/htop/htop.hash b/buildroot/package/htop/htop.hash
similarity index 100%
rename from software/package/htop/htop.hash
rename to buildroot/package/htop/htop.hash
diff --git a/software/package/htop/htop.mk b/buildroot/package/htop/htop.mk
similarity index 100%
rename from software/package/htop/htop.mk
rename to buildroot/package/htop/htop.mk
diff --git a/software/package/httping/0001-fix-math-library-linking.patch b/buildroot/package/httping/0001-fix-math-library-linking.patch
similarity index 100%
rename from software/package/httping/0001-fix-math-library-linking.patch
rename to buildroot/package/httping/0001-fix-math-library-linking.patch
diff --git a/software/package/httping/0002-Makefile-allow-build-without-gettext.patch b/buildroot/package/httping/0002-Makefile-allow-build-without-gettext.patch
similarity index 100%
rename from software/package/httping/0002-Makefile-allow-build-without-gettext.patch
rename to buildroot/package/httping/0002-Makefile-allow-build-without-gettext.patch
diff --git a/software/package/httping/Config.in b/buildroot/package/httping/Config.in
similarity index 100%
rename from software/package/httping/Config.in
rename to buildroot/package/httping/Config.in
diff --git a/software/package/httping/httping.hash b/buildroot/package/httping/httping.hash
similarity index 100%
rename from software/package/httping/httping.hash
rename to buildroot/package/httping/httping.hash
diff --git a/software/package/httping/httping.mk b/buildroot/package/httping/httping.mk
similarity index 100%
rename from software/package/httping/httping.mk
rename to buildroot/package/httping/httping.mk
diff --git a/software/package/hwdata/Config.in b/buildroot/package/hwdata/Config.in
similarity index 100%
rename from software/package/hwdata/Config.in
rename to buildroot/package/hwdata/Config.in
diff --git a/software/package/hwdata/hwdata.hash b/buildroot/package/hwdata/hwdata.hash
similarity index 100%
rename from software/package/hwdata/hwdata.hash
rename to buildroot/package/hwdata/hwdata.hash
diff --git a/software/package/hwdata/hwdata.mk b/buildroot/package/hwdata/hwdata.mk
similarity index 100%
rename from software/package/hwdata/hwdata.mk
rename to buildroot/package/hwdata/hwdata.mk
diff --git a/software/package/hwloc/Config.in b/buildroot/package/hwloc/Config.in
similarity index 100%
rename from software/package/hwloc/Config.in
rename to buildroot/package/hwloc/Config.in
diff --git a/software/package/hwloc/hwloc.hash b/buildroot/package/hwloc/hwloc.hash
similarity index 100%
rename from software/package/hwloc/hwloc.hash
rename to buildroot/package/hwloc/hwloc.hash
diff --git a/software/package/hwloc/hwloc.mk b/buildroot/package/hwloc/hwloc.mk
similarity index 100%
rename from software/package/hwloc/hwloc.mk
rename to buildroot/package/hwloc/hwloc.mk
diff --git a/software/package/i2c-tools/Config.in b/buildroot/package/i2c-tools/Config.in
similarity index 100%
rename from software/package/i2c-tools/Config.in
rename to buildroot/package/i2c-tools/Config.in
diff --git a/software/package/i2c-tools/i2c-tools.hash b/buildroot/package/i2c-tools/i2c-tools.hash
similarity index 100%
rename from software/package/i2c-tools/i2c-tools.hash
rename to buildroot/package/i2c-tools/i2c-tools.hash
diff --git a/software/package/i2c-tools/i2c-tools.mk b/buildroot/package/i2c-tools/i2c-tools.mk
similarity index 100%
rename from software/package/i2c-tools/i2c-tools.mk
rename to buildroot/package/i2c-tools/i2c-tools.mk
diff --git a/software/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch b/buildroot/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch
similarity index 100%
rename from software/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch
rename to buildroot/package/i2pd/0001-build-CMakeLists.txt-don-t-install-source-and-licens.patch
diff --git a/software/package/i2pd/Config.in b/buildroot/package/i2pd/Config.in
similarity index 100%
rename from software/package/i2pd/Config.in
rename to buildroot/package/i2pd/Config.in
diff --git a/software/package/i2pd/S99i2pd b/buildroot/package/i2pd/S99i2pd
similarity index 100%
rename from software/package/i2pd/S99i2pd
rename to buildroot/package/i2pd/S99i2pd
diff --git a/software/package/i2pd/i2pd.hash b/buildroot/package/i2pd/i2pd.hash
similarity index 100%
rename from software/package/i2pd/i2pd.hash
rename to buildroot/package/i2pd/i2pd.hash
diff --git a/software/package/i2pd/i2pd.mk b/buildroot/package/i2pd/i2pd.mk
similarity index 100%
rename from software/package/i2pd/i2pd.mk
rename to buildroot/package/i2pd/i2pd.mk
diff --git a/software/package/i2pd/i2pd.service b/buildroot/package/i2pd/i2pd.service
similarity index 100%
rename from software/package/i2pd/i2pd.service
rename to buildroot/package/i2pd/i2pd.service
diff --git a/software/package/i7z/Config.in b/buildroot/package/i7z/Config.in
similarity index 100%
rename from software/package/i7z/Config.in
rename to buildroot/package/i7z/Config.in
diff --git a/software/package/i7z/i7z.hash b/buildroot/package/i7z/i7z.hash
similarity index 100%
rename from software/package/i7z/i7z.hash
rename to buildroot/package/i7z/i7z.hash
diff --git a/software/package/i7z/i7z.mk b/buildroot/package/i7z/i7z.mk
similarity index 100%
rename from software/package/i7z/i7z.mk
rename to buildroot/package/i7z/i7z.mk
diff --git a/software/package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch b/buildroot/package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch
similarity index 100%
rename from software/package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch
rename to buildroot/package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch
diff --git a/software/package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch b/buildroot/package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch
similarity index 100%
rename from software/package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch
rename to buildroot/package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch
diff --git a/software/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch b/buildroot/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch
similarity index 100%
rename from software/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch
rename to buildroot/package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch
diff --git a/software/package/ibrcommon/Config.in b/buildroot/package/ibrcommon/Config.in
similarity index 100%
rename from software/package/ibrcommon/Config.in
rename to buildroot/package/ibrcommon/Config.in
diff --git a/software/package/ibrcommon/ibrcommon.hash b/buildroot/package/ibrcommon/ibrcommon.hash
similarity index 100%
rename from software/package/ibrcommon/ibrcommon.hash
rename to buildroot/package/ibrcommon/ibrcommon.hash
diff --git a/software/package/ibrcommon/ibrcommon.mk b/buildroot/package/ibrcommon/ibrcommon.mk
similarity index 100%
rename from software/package/ibrcommon/ibrcommon.mk
rename to buildroot/package/ibrcommon/ibrcommon.mk
diff --git a/software/package/ibrdtn-tools/Config.in b/buildroot/package/ibrdtn-tools/Config.in
similarity index 100%
rename from software/package/ibrdtn-tools/Config.in
rename to buildroot/package/ibrdtn-tools/Config.in
diff --git a/software/package/ibrdtn-tools/ibrdtn-tools.hash b/buildroot/package/ibrdtn-tools/ibrdtn-tools.hash
similarity index 100%
rename from software/package/ibrdtn-tools/ibrdtn-tools.hash
rename to buildroot/package/ibrdtn-tools/ibrdtn-tools.hash
diff --git a/software/package/ibrdtn-tools/ibrdtn-tools.mk b/buildroot/package/ibrdtn-tools/ibrdtn-tools.mk
similarity index 100%
rename from software/package/ibrdtn-tools/ibrdtn-tools.mk
rename to buildroot/package/ibrdtn-tools/ibrdtn-tools.mk
diff --git a/software/package/ibrdtn/Config.in b/buildroot/package/ibrdtn/Config.in
similarity index 100%
rename from software/package/ibrdtn/Config.in
rename to buildroot/package/ibrdtn/Config.in
diff --git a/software/package/ibrdtn/ibrdtn.hash b/buildroot/package/ibrdtn/ibrdtn.hash
similarity index 100%
rename from software/package/ibrdtn/ibrdtn.hash
rename to buildroot/package/ibrdtn/ibrdtn.hash
diff --git a/software/package/ibrdtn/ibrdtn.mk b/buildroot/package/ibrdtn/ibrdtn.mk
similarity index 100%
rename from software/package/ibrdtn/ibrdtn.mk
rename to buildroot/package/ibrdtn/ibrdtn.mk
diff --git a/software/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch b/buildroot/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch
similarity index 100%
rename from software/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch
rename to buildroot/package/ibrdtnd/0001-ibrdtnd-added-openssl-compatibility.patch
diff --git a/software/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch b/buildroot/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch
similarity index 100%
rename from software/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch
rename to buildroot/package/ibrdtnd/0002-SecurityCertificateManager.cpp-include-cstring-267.patch
diff --git a/software/package/ibrdtnd/Config.in b/buildroot/package/ibrdtnd/Config.in
similarity index 100%
rename from software/package/ibrdtnd/Config.in
rename to buildroot/package/ibrdtnd/Config.in
diff --git a/software/package/ibrdtnd/ibrdtnd.hash b/buildroot/package/ibrdtnd/ibrdtnd.hash
similarity index 100%
rename from software/package/ibrdtnd/ibrdtnd.hash
rename to buildroot/package/ibrdtnd/ibrdtnd.hash
diff --git a/software/package/ibrdtnd/ibrdtnd.mk b/buildroot/package/ibrdtnd/ibrdtnd.mk
similarity index 100%
rename from software/package/ibrdtnd/ibrdtnd.mk
rename to buildroot/package/ibrdtnd/ibrdtnd.mk
diff --git a/software/package/icu/0001-dont-build-static-dynamic-twice.patch b/buildroot/package/icu/0001-dont-build-static-dynamic-twice.patch
similarity index 100%
rename from software/package/icu/0001-dont-build-static-dynamic-twice.patch
rename to buildroot/package/icu/0001-dont-build-static-dynamic-twice.patch
diff --git a/software/package/icu/0002-workaround-toolchain-bugs.patch b/buildroot/package/icu/0002-workaround-toolchain-bugs.patch
similarity index 100%
rename from software/package/icu/0002-workaround-toolchain-bugs.patch
rename to buildroot/package/icu/0002-workaround-toolchain-bugs.patch
diff --git a/software/package/icu/0003-link-icudata-as-data-only.patch b/buildroot/package/icu/0003-link-icudata-as-data-only.patch
similarity index 100%
rename from software/package/icu/0003-link-icudata-as-data-only.patch
rename to buildroot/package/icu/0003-link-icudata-as-data-only.patch
diff --git a/software/package/icu/0004-fix-static-linking-with-icu-uc.patch b/buildroot/package/icu/0004-fix-static-linking-with-icu-uc.patch
similarity index 100%
rename from software/package/icu/0004-fix-static-linking-with-icu-uc.patch
rename to buildroot/package/icu/0004-fix-static-linking-with-icu-uc.patch
diff --git a/software/package/icu/0005-Fix-big-endian-build.patch b/buildroot/package/icu/0005-Fix-big-endian-build.patch
similarity index 100%
rename from software/package/icu/0005-Fix-big-endian-build.patch
rename to buildroot/package/icu/0005-Fix-big-endian-build.patch
diff --git a/software/package/icu/0006-ICU-20751-Fix-nios2-build.patch b/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch
similarity index 100%
rename from software/package/icu/0006-ICU-20751-Fix-nios2-build.patch
rename to buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch
diff --git a/software/package/icu/0007-double-conversion-enable-for-microblaze.patch b/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch
similarity index 100%
rename from software/package/icu/0007-double-conversion-enable-for-microblaze.patch
rename to buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch
diff --git a/software/package/icu/0008-double-conversion-enable-for-xtensa.patch b/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch
similarity index 100%
rename from software/package/icu/0008-double-conversion-enable-for-xtensa.patch
rename to buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch
diff --git a/software/package/icu/Config.in b/buildroot/package/icu/Config.in
similarity index 100%
rename from software/package/icu/Config.in
rename to buildroot/package/icu/Config.in
diff --git a/software/package/icu/icu.hash b/buildroot/package/icu/icu.hash
similarity index 100%
rename from software/package/icu/icu.hash
rename to buildroot/package/icu/icu.hash
diff --git a/software/package/icu/icu.mk b/buildroot/package/icu/icu.mk
similarity index 100%
rename from software/package/icu/icu.mk
rename to buildroot/package/icu/icu.mk
diff --git a/software/package/ifenslave/Config.in b/buildroot/package/ifenslave/Config.in
similarity index 100%
rename from software/package/ifenslave/Config.in
rename to buildroot/package/ifenslave/Config.in
diff --git a/software/package/ifenslave/ifenslave.hash b/buildroot/package/ifenslave/ifenslave.hash
similarity index 100%
rename from software/package/ifenslave/ifenslave.hash
rename to buildroot/package/ifenslave/ifenslave.hash
diff --git a/software/package/ifenslave/ifenslave.mk b/buildroot/package/ifenslave/ifenslave.mk
similarity index 100%
rename from software/package/ifenslave/ifenslave.mk
rename to buildroot/package/ifenslave/ifenslave.mk
diff --git a/software/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch b/buildroot/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch
similarity index 100%
rename from software/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch
rename to buildroot/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch
diff --git a/software/package/ifmetric/Config.in b/buildroot/package/ifmetric/Config.in
similarity index 100%
rename from software/package/ifmetric/Config.in
rename to buildroot/package/ifmetric/Config.in
diff --git a/software/package/ifmetric/ifmetric.hash b/buildroot/package/ifmetric/ifmetric.hash
similarity index 100%
rename from software/package/ifmetric/ifmetric.hash
rename to buildroot/package/ifmetric/ifmetric.hash
diff --git a/software/package/ifmetric/ifmetric.mk b/buildroot/package/ifmetric/ifmetric.mk
similarity index 100%
rename from software/package/ifmetric/ifmetric.mk
rename to buildroot/package/ifmetric/ifmetric.mk
diff --git a/software/package/ifplugd/0001-cross.patch b/buildroot/package/ifplugd/0001-cross.patch
similarity index 100%
rename from software/package/ifplugd/0001-cross.patch
rename to buildroot/package/ifplugd/0001-cross.patch
diff --git a/software/package/ifplugd/0002-fix-headers.patch b/buildroot/package/ifplugd/0002-fix-headers.patch
similarity index 100%
rename from software/package/ifplugd/0002-fix-headers.patch
rename to buildroot/package/ifplugd/0002-fix-headers.patch
diff --git a/software/package/ifplugd/0003-no-cxx.patch b/buildroot/package/ifplugd/0003-no-cxx.patch
similarity index 100%
rename from software/package/ifplugd/0003-no-cxx.patch
rename to buildroot/package/ifplugd/0003-no-cxx.patch
diff --git a/software/package/ifplugd/0004-musl-fix-types.patch b/buildroot/package/ifplugd/0004-musl-fix-types.patch
similarity index 100%
rename from software/package/ifplugd/0004-musl-fix-types.patch
rename to buildroot/package/ifplugd/0004-musl-fix-types.patch
diff --git a/software/package/ifplugd/Config.in b/buildroot/package/ifplugd/Config.in
similarity index 100%
rename from software/package/ifplugd/Config.in
rename to buildroot/package/ifplugd/Config.in
diff --git a/software/package/ifplugd/ifplugd.hash b/buildroot/package/ifplugd/ifplugd.hash
similarity index 100%
rename from software/package/ifplugd/ifplugd.hash
rename to buildroot/package/ifplugd/ifplugd.hash
diff --git a/software/package/ifplugd/ifplugd.mk b/buildroot/package/ifplugd/ifplugd.mk
similarity index 100%
rename from software/package/ifplugd/ifplugd.mk
rename to buildroot/package/ifplugd/ifplugd.mk
diff --git a/software/package/iftop/Config.in b/buildroot/package/iftop/Config.in
similarity index 100%
rename from software/package/iftop/Config.in
rename to buildroot/package/iftop/Config.in
diff --git a/software/package/iftop/iftop.hash b/buildroot/package/iftop/iftop.hash
similarity index 100%
rename from software/package/iftop/iftop.hash
rename to buildroot/package/iftop/iftop.hash
diff --git a/software/package/iftop/iftop.mk b/buildroot/package/iftop/iftop.mk
similarity index 100%
rename from software/package/iftop/iftop.mk
rename to buildroot/package/iftop/iftop.mk
diff --git a/software/package/ifupdown-scripts/Config.in b/buildroot/package/ifupdown-scripts/Config.in
similarity index 100%
rename from software/package/ifupdown-scripts/Config.in
rename to buildroot/package/ifupdown-scripts/Config.in
diff --git a/software/package/ifupdown-scripts/S40network b/buildroot/package/ifupdown-scripts/S40network
similarity index 100%
rename from software/package/ifupdown-scripts/S40network
rename to buildroot/package/ifupdown-scripts/S40network
diff --git a/software/package/ifupdown-scripts/ifupdown-scripts.mk b/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk
similarity index 100%
rename from software/package/ifupdown-scripts/ifupdown-scripts.mk
rename to buildroot/package/ifupdown-scripts/ifupdown-scripts.mk
diff --git a/software/package/ifupdown-scripts/network.service b/buildroot/package/ifupdown-scripts/network.service
similarity index 100%
rename from software/package/ifupdown-scripts/network.service
rename to buildroot/package/ifupdown-scripts/network.service
diff --git a/software/package/ifupdown-scripts/network/if-down.d/.empty b/buildroot/package/ifupdown-scripts/network/if-down.d/.empty
similarity index 100%
rename from software/package/ifupdown-scripts/network/if-down.d/.empty
rename to buildroot/package/ifupdown-scripts/network/if-down.d/.empty
diff --git a/software/package/ifupdown-scripts/network/if-post-down.d/.empty b/buildroot/package/ifupdown-scripts/network/if-post-down.d/.empty
similarity index 100%
rename from software/package/ifupdown-scripts/network/if-post-down.d/.empty
rename to buildroot/package/ifupdown-scripts/network/if-post-down.d/.empty
diff --git a/software/package/ifupdown-scripts/network/if-pre-up.d/wait_iface b/buildroot/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
similarity index 100%
rename from software/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
rename to buildroot/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
diff --git a/software/package/ifupdown-scripts/network/if-up.d/.empty b/buildroot/package/ifupdown-scripts/network/if-up.d/.empty
similarity index 100%
rename from software/package/ifupdown-scripts/network/if-up.d/.empty
rename to buildroot/package/ifupdown-scripts/network/if-up.d/.empty
diff --git a/software/package/ifupdown-scripts/nfs_check b/buildroot/package/ifupdown-scripts/nfs_check
similarity index 100%
rename from software/package/ifupdown-scripts/nfs_check
rename to buildroot/package/ifupdown-scripts/nfs_check
diff --git a/software/package/ifupdown/0001-dont-use-dpkg-architecture.patch b/buildroot/package/ifupdown/0001-dont-use-dpkg-architecture.patch
similarity index 100%
rename from software/package/ifupdown/0001-dont-use-dpkg-architecture.patch
rename to buildroot/package/ifupdown/0001-dont-use-dpkg-architecture.patch
diff --git a/software/package/ifupdown/Config.in b/buildroot/package/ifupdown/Config.in
similarity index 100%
rename from software/package/ifupdown/Config.in
rename to buildroot/package/ifupdown/Config.in
diff --git a/software/package/ifupdown/ifupdown.hash b/buildroot/package/ifupdown/ifupdown.hash
similarity index 100%
rename from software/package/ifupdown/ifupdown.hash
rename to buildroot/package/ifupdown/ifupdown.hash
diff --git a/software/package/ifupdown/ifupdown.mk b/buildroot/package/ifupdown/ifupdown.mk
similarity index 100%
rename from software/package/ifupdown/ifupdown.mk
rename to buildroot/package/ifupdown/ifupdown.mk
diff --git a/software/package/igd2-for-linux/Config.in b/buildroot/package/igd2-for-linux/Config.in
similarity index 100%
rename from software/package/igd2-for-linux/Config.in
rename to buildroot/package/igd2-for-linux/Config.in
diff --git a/software/package/igd2-for-linux/S99upnpd b/buildroot/package/igd2-for-linux/S99upnpd
similarity index 100%
rename from software/package/igd2-for-linux/S99upnpd
rename to buildroot/package/igd2-for-linux/S99upnpd
diff --git a/software/package/igd2-for-linux/igd2-for-linux.hash b/buildroot/package/igd2-for-linux/igd2-for-linux.hash
similarity index 100%
rename from software/package/igd2-for-linux/igd2-for-linux.hash
rename to buildroot/package/igd2-for-linux/igd2-for-linux.hash
diff --git a/software/package/igd2-for-linux/igd2-for-linux.mk b/buildroot/package/igd2-for-linux/igd2-for-linux.mk
similarity index 100%
rename from software/package/igd2-for-linux/igd2-for-linux.mk
rename to buildroot/package/igd2-for-linux/igd2-for-linux.mk
diff --git a/software/package/igd2-for-linux/upnpd.service b/buildroot/package/igd2-for-linux/upnpd.service
similarity index 100%
rename from software/package/igd2-for-linux/upnpd.service
rename to buildroot/package/igd2-for-linux/upnpd.service
diff --git a/software/package/igh-ethercat/Config.in b/buildroot/package/igh-ethercat/Config.in
similarity index 100%
rename from software/package/igh-ethercat/Config.in
rename to buildroot/package/igh-ethercat/Config.in
diff --git a/software/package/igh-ethercat/igh-ethercat.hash b/buildroot/package/igh-ethercat/igh-ethercat.hash
similarity index 100%
rename from software/package/igh-ethercat/igh-ethercat.hash
rename to buildroot/package/igh-ethercat/igh-ethercat.hash
diff --git a/software/package/igh-ethercat/igh-ethercat.mk b/buildroot/package/igh-ethercat/igh-ethercat.mk
similarity index 100%
rename from software/package/igh-ethercat/igh-ethercat.mk
rename to buildroot/package/igh-ethercat/igh-ethercat.mk
diff --git a/software/package/igmpproxy/Config.in b/buildroot/package/igmpproxy/Config.in
similarity index 100%
rename from software/package/igmpproxy/Config.in
rename to buildroot/package/igmpproxy/Config.in
diff --git a/software/package/igmpproxy/igmpproxy.hash b/buildroot/package/igmpproxy/igmpproxy.hash
similarity index 100%
rename from software/package/igmpproxy/igmpproxy.hash
rename to buildroot/package/igmpproxy/igmpproxy.hash
diff --git a/software/package/igmpproxy/igmpproxy.mk b/buildroot/package/igmpproxy/igmpproxy.mk
similarity index 100%
rename from software/package/igmpproxy/igmpproxy.mk
rename to buildroot/package/igmpproxy/igmpproxy.mk
diff --git a/software/package/ijs/Config.in b/buildroot/package/ijs/Config.in
similarity index 100%
rename from software/package/ijs/Config.in
rename to buildroot/package/ijs/Config.in
diff --git a/software/package/ijs/ijs.hash b/buildroot/package/ijs/ijs.hash
similarity index 100%
rename from software/package/ijs/ijs.hash
rename to buildroot/package/ijs/ijs.hash
diff --git a/software/package/ijs/ijs.mk b/buildroot/package/ijs/ijs.mk
similarity index 100%
rename from software/package/ijs/ijs.mk
rename to buildroot/package/ijs/ijs.mk
diff --git a/software/package/ima-evm-utils/Config.in b/buildroot/package/ima-evm-utils/Config.in
similarity index 100%
rename from software/package/ima-evm-utils/Config.in
rename to buildroot/package/ima-evm-utils/Config.in
diff --git a/software/package/ima-evm-utils/ima-evm-utils.hash b/buildroot/package/ima-evm-utils/ima-evm-utils.hash
similarity index 100%
rename from software/package/ima-evm-utils/ima-evm-utils.hash
rename to buildroot/package/ima-evm-utils/ima-evm-utils.hash
diff --git a/software/package/ima-evm-utils/ima-evm-utils.mk b/buildroot/package/ima-evm-utils/ima-evm-utils.mk
similarity index 100%
rename from software/package/ima-evm-utils/ima-evm-utils.mk
rename to buildroot/package/ima-evm-utils/ima-evm-utils.mk
diff --git a/software/package/imagemagick/Config.in b/buildroot/package/imagemagick/Config.in
similarity index 100%
rename from software/package/imagemagick/Config.in
rename to buildroot/package/imagemagick/Config.in
diff --git a/software/package/imagemagick/Config.in.host b/buildroot/package/imagemagick/Config.in.host
similarity index 100%
rename from software/package/imagemagick/Config.in.host
rename to buildroot/package/imagemagick/Config.in.host
diff --git a/software/package/imagemagick/imagemagick.hash b/buildroot/package/imagemagick/imagemagick.hash
similarity index 100%
rename from software/package/imagemagick/imagemagick.hash
rename to buildroot/package/imagemagick/imagemagick.hash
diff --git a/software/package/imagemagick/imagemagick.mk b/buildroot/package/imagemagick/imagemagick.mk
similarity index 100%
rename from software/package/imagemagick/imagemagick.mk
rename to buildroot/package/imagemagick/imagemagick.mk
diff --git a/software/package/imlib2/Config.in b/buildroot/package/imlib2/Config.in
similarity index 100%
rename from software/package/imlib2/Config.in
rename to buildroot/package/imlib2/Config.in
diff --git a/software/package/imlib2/imlib2.hash b/buildroot/package/imlib2/imlib2.hash
similarity index 100%
rename from software/package/imlib2/imlib2.hash
rename to buildroot/package/imlib2/imlib2.hash
diff --git a/software/package/imlib2/imlib2.mk b/buildroot/package/imlib2/imlib2.mk
similarity index 100%
rename from software/package/imlib2/imlib2.mk
rename to buildroot/package/imlib2/imlib2.mk
diff --git a/software/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch b/buildroot/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
similarity index 100%
rename from software/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
rename to buildroot/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
diff --git a/software/package/imx-mkimage/0002-add-ldflags-to-link-step.patch b/buildroot/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
similarity index 100%
rename from software/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
rename to buildroot/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
diff --git a/software/package/imx-mkimage/0003-Add-unused-fake-version.patch b/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch
similarity index 100%
rename from software/package/imx-mkimage/0003-Add-unused-fake-version.patch
rename to buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch
diff --git a/software/package/imx-mkimage/Config.in.host b/buildroot/package/imx-mkimage/Config.in.host
similarity index 100%
rename from software/package/imx-mkimage/Config.in.host
rename to buildroot/package/imx-mkimage/Config.in.host
diff --git a/software/package/imx-mkimage/imx-mkimage.hash b/buildroot/package/imx-mkimage/imx-mkimage.hash
similarity index 100%
rename from software/package/imx-mkimage/imx-mkimage.hash
rename to buildroot/package/imx-mkimage/imx-mkimage.hash
diff --git a/software/package/imx-mkimage/imx-mkimage.mk b/buildroot/package/imx-mkimage/imx-mkimage.mk
similarity index 100%
rename from software/package/imx-mkimage/imx-mkimage.mk
rename to buildroot/package/imx-mkimage/imx-mkimage.mk
diff --git a/software/package/imx-usb-loader/Config.in b/buildroot/package/imx-usb-loader/Config.in
similarity index 100%
rename from software/package/imx-usb-loader/Config.in
rename to buildroot/package/imx-usb-loader/Config.in
diff --git a/software/package/imx-usb-loader/Config.in.host b/buildroot/package/imx-usb-loader/Config.in.host
similarity index 100%
rename from software/package/imx-usb-loader/Config.in.host
rename to buildroot/package/imx-usb-loader/Config.in.host
diff --git a/software/package/imx-usb-loader/imx-usb-loader.hash b/buildroot/package/imx-usb-loader/imx-usb-loader.hash
similarity index 100%
rename from software/package/imx-usb-loader/imx-usb-loader.hash
rename to buildroot/package/imx-usb-loader/imx-usb-loader.hash
diff --git a/software/package/imx-usb-loader/imx-usb-loader.mk b/buildroot/package/imx-usb-loader/imx-usb-loader.mk
similarity index 100%
rename from software/package/imx-usb-loader/imx-usb-loader.mk
rename to buildroot/package/imx-usb-loader/imx-usb-loader.mk
diff --git a/software/package/inadyn/Config.in b/buildroot/package/inadyn/Config.in
similarity index 100%
rename from software/package/inadyn/Config.in
rename to buildroot/package/inadyn/Config.in
diff --git a/software/package/inadyn/S70inadyn b/buildroot/package/inadyn/S70inadyn
similarity index 100%
rename from software/package/inadyn/S70inadyn
rename to buildroot/package/inadyn/S70inadyn
diff --git a/software/package/inadyn/inadyn.conf b/buildroot/package/inadyn/inadyn.conf
similarity index 100%
rename from software/package/inadyn/inadyn.conf
rename to buildroot/package/inadyn/inadyn.conf
diff --git a/software/package/inadyn/inadyn.hash b/buildroot/package/inadyn/inadyn.hash
similarity index 100%
rename from software/package/inadyn/inadyn.hash
rename to buildroot/package/inadyn/inadyn.hash
diff --git a/software/package/inadyn/inadyn.mk b/buildroot/package/inadyn/inadyn.mk
similarity index 100%
rename from software/package/inadyn/inadyn.mk
rename to buildroot/package/inadyn/inadyn.mk
diff --git a/software/package/inadyn/inadyn.service b/buildroot/package/inadyn/inadyn.service
similarity index 100%
rename from software/package/inadyn/inadyn.service
rename to buildroot/package/inadyn/inadyn.service
diff --git a/software/package/inconsolata/Config.in b/buildroot/package/inconsolata/Config.in
similarity index 100%
rename from software/package/inconsolata/Config.in
rename to buildroot/package/inconsolata/Config.in
diff --git a/software/package/inconsolata/inconsolata.hash b/buildroot/package/inconsolata/inconsolata.hash
similarity index 100%
rename from software/package/inconsolata/inconsolata.hash
rename to buildroot/package/inconsolata/inconsolata.hash
diff --git a/software/package/inconsolata/inconsolata.mk b/buildroot/package/inconsolata/inconsolata.mk
similarity index 100%
rename from software/package/inconsolata/inconsolata.mk
rename to buildroot/package/inconsolata/inconsolata.mk
diff --git a/software/package/initscripts/Config.in b/buildroot/package/initscripts/Config.in
similarity index 100%
rename from software/package/initscripts/Config.in
rename to buildroot/package/initscripts/Config.in
diff --git a/software/package/initscripts/init.d/S20urandom b/buildroot/package/initscripts/init.d/S20urandom
similarity index 100%
rename from software/package/initscripts/init.d/S20urandom
rename to buildroot/package/initscripts/init.d/S20urandom
diff --git a/software/package/initscripts/init.d/rcK b/buildroot/package/initscripts/init.d/rcK
similarity index 100%
rename from software/package/initscripts/init.d/rcK
rename to buildroot/package/initscripts/init.d/rcK
diff --git a/software/package/initscripts/init.d/rcS b/buildroot/package/initscripts/init.d/rcS
similarity index 100%
rename from software/package/initscripts/init.d/rcS
rename to buildroot/package/initscripts/init.d/rcS
diff --git a/software/package/initscripts/initscripts.mk b/buildroot/package/initscripts/initscripts.mk
similarity index 100%
rename from software/package/initscripts/initscripts.mk
rename to buildroot/package/initscripts/initscripts.mk
diff --git a/software/package/inotify-tools/Config.in b/buildroot/package/inotify-tools/Config.in
similarity index 100%
rename from software/package/inotify-tools/Config.in
rename to buildroot/package/inotify-tools/Config.in
diff --git a/software/package/inotify-tools/inotify-tools.hash b/buildroot/package/inotify-tools/inotify-tools.hash
similarity index 100%
rename from software/package/inotify-tools/inotify-tools.hash
rename to buildroot/package/inotify-tools/inotify-tools.hash
diff --git a/software/package/inotify-tools/inotify-tools.mk b/buildroot/package/inotify-tools/inotify-tools.mk
similarity index 100%
rename from software/package/inotify-tools/inotify-tools.mk
rename to buildroot/package/inotify-tools/inotify-tools.mk
diff --git a/software/package/input-event-daemon/Config.in b/buildroot/package/input-event-daemon/Config.in
similarity index 100%
rename from software/package/input-event-daemon/Config.in
rename to buildroot/package/input-event-daemon/Config.in
diff --git a/software/package/input-event-daemon/S99input-event-daemon b/buildroot/package/input-event-daemon/S99input-event-daemon
similarity index 100%
rename from software/package/input-event-daemon/S99input-event-daemon
rename to buildroot/package/input-event-daemon/S99input-event-daemon
diff --git a/software/package/input-event-daemon/input-event-daemon.hash b/buildroot/package/input-event-daemon/input-event-daemon.hash
similarity index 100%
rename from software/package/input-event-daemon/input-event-daemon.hash
rename to buildroot/package/input-event-daemon/input-event-daemon.hash
diff --git a/software/package/input-event-daemon/input-event-daemon.mk b/buildroot/package/input-event-daemon/input-event-daemon.mk
similarity index 100%
rename from software/package/input-event-daemon/input-event-daemon.mk
rename to buildroot/package/input-event-daemon/input-event-daemon.mk
diff --git a/software/package/input-event-daemon/input-event-daemon.service b/buildroot/package/input-event-daemon/input-event-daemon.service
similarity index 100%
rename from software/package/input-event-daemon/input-event-daemon.service
rename to buildroot/package/input-event-daemon/input-event-daemon.service
diff --git a/software/package/intel-gmmlib/Config.in b/buildroot/package/intel-gmmlib/Config.in
similarity index 100%
rename from software/package/intel-gmmlib/Config.in
rename to buildroot/package/intel-gmmlib/Config.in
diff --git a/software/package/intel-gmmlib/intel-gmmlib.hash b/buildroot/package/intel-gmmlib/intel-gmmlib.hash
similarity index 100%
rename from software/package/intel-gmmlib/intel-gmmlib.hash
rename to buildroot/package/intel-gmmlib/intel-gmmlib.hash
diff --git a/software/package/intel-gmmlib/intel-gmmlib.mk b/buildroot/package/intel-gmmlib/intel-gmmlib.mk
similarity index 100%
rename from software/package/intel-gmmlib/intel-gmmlib.mk
rename to buildroot/package/intel-gmmlib/intel-gmmlib.mk
diff --git a/software/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch b/buildroot/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
similarity index 100%
rename from software/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
rename to buildroot/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch
diff --git a/software/package/intel-mediadriver/Config.in b/buildroot/package/intel-mediadriver/Config.in
similarity index 100%
rename from software/package/intel-mediadriver/Config.in
rename to buildroot/package/intel-mediadriver/Config.in
diff --git a/software/package/intel-mediadriver/intel-mediadriver.hash b/buildroot/package/intel-mediadriver/intel-mediadriver.hash
similarity index 100%
rename from software/package/intel-mediadriver/intel-mediadriver.hash
rename to buildroot/package/intel-mediadriver/intel-mediadriver.hash
diff --git a/software/package/intel-mediadriver/intel-mediadriver.mk b/buildroot/package/intel-mediadriver/intel-mediadriver.mk
similarity index 100%
rename from software/package/intel-mediadriver/intel-mediadriver.mk
rename to buildroot/package/intel-mediadriver/intel-mediadriver.mk
diff --git a/software/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/buildroot/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch
similarity index 100%
rename from software/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch
rename to buildroot/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch
diff --git a/software/package/intel-mediasdk/Config.in b/buildroot/package/intel-mediasdk/Config.in
similarity index 100%
rename from software/package/intel-mediasdk/Config.in
rename to buildroot/package/intel-mediasdk/Config.in
diff --git a/software/package/intel-mediasdk/intel-mediasdk.hash b/buildroot/package/intel-mediasdk/intel-mediasdk.hash
similarity index 100%
rename from software/package/intel-mediasdk/intel-mediasdk.hash
rename to buildroot/package/intel-mediasdk/intel-mediasdk.hash
diff --git a/software/package/intel-mediasdk/intel-mediasdk.mk b/buildroot/package/intel-mediasdk/intel-mediasdk.mk
similarity index 100%
rename from software/package/intel-mediasdk/intel-mediasdk.mk
rename to buildroot/package/intel-mediasdk/intel-mediasdk.mk
diff --git a/software/package/intel-microcode/Config.in b/buildroot/package/intel-microcode/Config.in
similarity index 100%
rename from software/package/intel-microcode/Config.in
rename to buildroot/package/intel-microcode/Config.in
diff --git a/software/package/intel-microcode/intel-microcode.hash b/buildroot/package/intel-microcode/intel-microcode.hash
similarity index 100%
rename from software/package/intel-microcode/intel-microcode.hash
rename to buildroot/package/intel-microcode/intel-microcode.hash
diff --git a/software/package/intel-microcode/intel-microcode.mk b/buildroot/package/intel-microcode/intel-microcode.mk
similarity index 100%
rename from software/package/intel-microcode/intel-microcode.mk
rename to buildroot/package/intel-microcode/intel-microcode.mk
diff --git a/software/package/intltool/0001-perl-5.26-compatibility.patch b/buildroot/package/intltool/0001-perl-5.26-compatibility.patch
similarity index 100%
rename from software/package/intltool/0001-perl-5.26-compatibility.patch
rename to buildroot/package/intltool/0001-perl-5.26-compatibility.patch
diff --git a/software/package/intltool/intltool.hash b/buildroot/package/intltool/intltool.hash
similarity index 100%
rename from software/package/intltool/intltool.hash
rename to buildroot/package/intltool/intltool.hash
diff --git a/software/package/intltool/intltool.mk b/buildroot/package/intltool/intltool.mk
similarity index 100%
rename from software/package/intltool/intltool.mk
rename to buildroot/package/intltool/intltool.mk
diff --git a/software/package/iodine/0001-disable-systemd-and-selinux.patch b/buildroot/package/iodine/0001-disable-systemd-and-selinux.patch
similarity index 100%
rename from software/package/iodine/0001-disable-systemd-and-selinux.patch
rename to buildroot/package/iodine/0001-disable-systemd-and-selinux.patch
diff --git a/software/package/iodine/Config.in b/buildroot/package/iodine/Config.in
similarity index 100%
rename from software/package/iodine/Config.in
rename to buildroot/package/iodine/Config.in
diff --git a/software/package/iodine/iodine.hash b/buildroot/package/iodine/iodine.hash
similarity index 100%
rename from software/package/iodine/iodine.hash
rename to buildroot/package/iodine/iodine.hash
diff --git a/software/package/iodine/iodine.mk b/buildroot/package/iodine/iodine.mk
similarity index 100%
rename from software/package/iodine/iodine.mk
rename to buildroot/package/iodine/iodine.mk
diff --git a/software/package/iostat/0001-cpunum.patch b/buildroot/package/iostat/0001-cpunum.patch
similarity index 100%
rename from software/package/iostat/0001-cpunum.patch
rename to buildroot/package/iostat/0001-cpunum.patch
diff --git a/software/package/iostat/Config.in b/buildroot/package/iostat/Config.in
similarity index 100%
rename from software/package/iostat/Config.in
rename to buildroot/package/iostat/Config.in
diff --git a/software/package/iostat/iostat.hash b/buildroot/package/iostat/iostat.hash
similarity index 100%
rename from software/package/iostat/iostat.hash
rename to buildroot/package/iostat/iostat.hash
diff --git a/software/package/iostat/iostat.mk b/buildroot/package/iostat/iostat.mk
similarity index 100%
rename from software/package/iostat/iostat.mk
rename to buildroot/package/iostat/iostat.mk
diff --git a/software/package/iotop/0001-Fix-build-error-with-Python-3.patch b/buildroot/package/iotop/0001-Fix-build-error-with-Python-3.patch
similarity index 100%
rename from software/package/iotop/0001-Fix-build-error-with-Python-3.patch
rename to buildroot/package/iotop/0001-Fix-build-error-with-Python-3.patch
diff --git a/software/package/iotop/Config.in b/buildroot/package/iotop/Config.in
similarity index 100%
rename from software/package/iotop/Config.in
rename to buildroot/package/iotop/Config.in
diff --git a/software/package/iotop/iotop.hash b/buildroot/package/iotop/iotop.hash
similarity index 100%
rename from software/package/iotop/iotop.hash
rename to buildroot/package/iotop/iotop.hash
diff --git a/software/package/iotop/iotop.mk b/buildroot/package/iotop/iotop.mk
similarity index 100%
rename from software/package/iotop/iotop.mk
rename to buildroot/package/iotop/iotop.mk
diff --git a/software/package/iozone/0001-Add-new-targets-for-iozone.patch b/buildroot/package/iozone/0001-Add-new-targets-for-iozone.patch
similarity index 100%
rename from software/package/iozone/0001-Add-new-targets-for-iozone.patch
rename to buildroot/package/iozone/0001-Add-new-targets-for-iozone.patch
diff --git a/software/package/iozone/Config.in b/buildroot/package/iozone/Config.in
similarity index 100%
rename from software/package/iozone/Config.in
rename to buildroot/package/iozone/Config.in
diff --git a/software/package/iozone/iozone.hash b/buildroot/package/iozone/iozone.hash
similarity index 100%
rename from software/package/iozone/iozone.hash
rename to buildroot/package/iozone/iozone.hash
diff --git a/software/package/iozone/iozone.mk b/buildroot/package/iozone/iozone.mk
similarity index 100%
rename from software/package/iozone/iozone.mk
rename to buildroot/package/iozone/iozone.mk
diff --git a/software/package/iperf/Config.in b/buildroot/package/iperf/Config.in
similarity index 100%
rename from software/package/iperf/Config.in
rename to buildroot/package/iperf/Config.in
diff --git a/software/package/iperf/iperf.hash b/buildroot/package/iperf/iperf.hash
similarity index 100%
rename from software/package/iperf/iperf.hash
rename to buildroot/package/iperf/iperf.hash
diff --git a/software/package/iperf/iperf.mk b/buildroot/package/iperf/iperf.mk
similarity index 100%
rename from software/package/iperf/iperf.mk
rename to buildroot/package/iperf/iperf.mk
diff --git a/software/package/iperf3/Config.in b/buildroot/package/iperf3/Config.in
similarity index 100%
rename from software/package/iperf3/Config.in
rename to buildroot/package/iperf3/Config.in
diff --git a/software/package/iperf3/iperf3.hash b/buildroot/package/iperf3/iperf3.hash
similarity index 100%
rename from software/package/iperf3/iperf3.hash
rename to buildroot/package/iperf3/iperf3.hash
diff --git a/software/package/iperf3/iperf3.mk b/buildroot/package/iperf3/iperf3.mk
similarity index 100%
rename from software/package/iperf3/iperf3.mk
rename to buildroot/package/iperf3/iperf3.mk
diff --git a/software/package/ipmitool/0001-Fix-missing-stddef.h-include.patch b/buildroot/package/ipmitool/0001-Fix-missing-stddef.h-include.patch
similarity index 100%
rename from software/package/ipmitool/0001-Fix-missing-stddef.h-include.patch
rename to buildroot/package/ipmitool/0001-Fix-missing-stddef.h-include.patch
diff --git a/software/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch b/buildroot/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
similarity index 100%
rename from software/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
rename to buildroot/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
diff --git a/software/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch b/buildroot/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch
similarity index 100%
rename from software/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch
rename to buildroot/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch
diff --git a/software/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch b/buildroot/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
similarity index 100%
rename from software/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
rename to buildroot/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
diff --git a/software/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch b/buildroot/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
similarity index 100%
rename from software/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
rename to buildroot/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
diff --git a/software/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch b/buildroot/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch
similarity index 100%
rename from software/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch
rename to buildroot/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch
diff --git a/software/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch b/buildroot/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch
similarity index 100%
rename from software/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch
rename to buildroot/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch
diff --git a/software/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/buildroot/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
similarity index 100%
rename from software/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
rename to buildroot/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
diff --git a/software/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/buildroot/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
similarity index 100%
rename from software/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
rename to buildroot/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
diff --git a/software/package/ipmitool/0011-channel-Fix-buffer-overflow.patch b/buildroot/package/ipmitool/0011-channel-Fix-buffer-overflow.patch
similarity index 100%
rename from software/package/ipmitool/0011-channel-Fix-buffer-overflow.patch
rename to buildroot/package/ipmitool/0011-channel-Fix-buffer-overflow.patch
diff --git a/software/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/buildroot/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
similarity index 100%
rename from software/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
rename to buildroot/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
diff --git a/software/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch b/buildroot/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch
similarity index 100%
rename from software/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch
rename to buildroot/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch
diff --git a/software/package/ipmitool/Config.in b/buildroot/package/ipmitool/Config.in
similarity index 100%
rename from software/package/ipmitool/Config.in
rename to buildroot/package/ipmitool/Config.in
diff --git a/software/package/ipmitool/ipmitool.hash b/buildroot/package/ipmitool/ipmitool.hash
similarity index 100%
rename from software/package/ipmitool/ipmitool.hash
rename to buildroot/package/ipmitool/ipmitool.hash
diff --git a/software/package/ipmitool/ipmitool.mk b/buildroot/package/ipmitool/ipmitool.mk
similarity index 100%
rename from software/package/ipmitool/ipmitool.mk
rename to buildroot/package/ipmitool/ipmitool.mk
diff --git a/software/package/ipmiutil/0001-no-build-doc.patch b/buildroot/package/ipmiutil/0001-no-build-doc.patch
similarity index 100%
rename from software/package/ipmiutil/0001-no-build-doc.patch
rename to buildroot/package/ipmiutil/0001-no-build-doc.patch
diff --git a/software/package/ipmiutil/Config.in b/buildroot/package/ipmiutil/Config.in
similarity index 100%
rename from software/package/ipmiutil/Config.in
rename to buildroot/package/ipmiutil/Config.in
diff --git a/software/package/ipmiutil/ipmiutil.hash b/buildroot/package/ipmiutil/ipmiutil.hash
similarity index 100%
rename from software/package/ipmiutil/ipmiutil.hash
rename to buildroot/package/ipmiutil/ipmiutil.hash
diff --git a/software/package/ipmiutil/ipmiutil.mk b/buildroot/package/ipmiutil/ipmiutil.mk
similarity index 100%
rename from software/package/ipmiutil/ipmiutil.mk
rename to buildroot/package/ipmiutil/ipmiutil.mk
diff --git a/software/package/iproute2/Config.in b/buildroot/package/iproute2/Config.in
similarity index 100%
rename from software/package/iproute2/Config.in
rename to buildroot/package/iproute2/Config.in
diff --git a/software/package/iproute2/iproute2.hash b/buildroot/package/iproute2/iproute2.hash
similarity index 100%
rename from software/package/iproute2/iproute2.hash
rename to buildroot/package/iproute2/iproute2.hash
diff --git a/software/package/iproute2/iproute2.mk b/buildroot/package/iproute2/iproute2.mk
similarity index 100%
rename from software/package/iproute2/iproute2.mk
rename to buildroot/package/iproute2/iproute2.mk
diff --git a/software/package/iprutils/Config.in b/buildroot/package/iprutils/Config.in
similarity index 100%
rename from software/package/iprutils/Config.in
rename to buildroot/package/iprutils/Config.in
diff --git a/software/package/iprutils/iprutils.hash b/buildroot/package/iprutils/iprutils.hash
similarity index 100%
rename from software/package/iprutils/iprutils.hash
rename to buildroot/package/iprutils/iprutils.hash
diff --git a/software/package/iprutils/iprutils.mk b/buildroot/package/iprutils/iprutils.mk
similarity index 100%
rename from software/package/iprutils/iprutils.mk
rename to buildroot/package/iprutils/iprutils.mk
diff --git a/software/package/ipsec-tools/0001-susv3-legacy.patch b/buildroot/package/ipsec-tools/0001-susv3-legacy.patch
similarity index 100%
rename from software/package/ipsec-tools/0001-susv3-legacy.patch
rename to buildroot/package/ipsec-tools/0001-susv3-legacy.patch
diff --git a/software/package/ipsec-tools/0002-configure-automake.patch b/buildroot/package/ipsec-tools/0002-configure-automake.patch
similarity index 100%
rename from software/package/ipsec-tools/0002-configure-automake.patch
rename to buildroot/package/ipsec-tools/0002-configure-automake.patch
diff --git a/software/package/ipsec-tools/0003-Don-t-link-against-libfl.patch b/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch
similarity index 100%
rename from software/package/ipsec-tools/0003-Don-t-link-against-libfl.patch
rename to buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch
diff --git a/software/package/ipsec-tools/0004-CVE-2015-4047.patch b/buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch
similarity index 100%
rename from software/package/ipsec-tools/0004-CVE-2015-4047.patch
rename to buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch
diff --git a/software/package/ipsec-tools/0005-CVE-2016-10396.patch b/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch
similarity index 100%
rename from software/package/ipsec-tools/0005-CVE-2016-10396.patch
rename to buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch
diff --git a/software/package/ipsec-tools/0006-openssl-1.1.patch b/buildroot/package/ipsec-tools/0006-openssl-1.1.patch
similarity index 100%
rename from software/package/ipsec-tools/0006-openssl-1.1.patch
rename to buildroot/package/ipsec-tools/0006-openssl-1.1.patch
diff --git a/software/package/ipsec-tools/Config.in b/buildroot/package/ipsec-tools/Config.in
similarity index 100%
rename from software/package/ipsec-tools/Config.in
rename to buildroot/package/ipsec-tools/Config.in
diff --git a/software/package/ipsec-tools/ipsec-tools.hash b/buildroot/package/ipsec-tools/ipsec-tools.hash
similarity index 100%
rename from software/package/ipsec-tools/ipsec-tools.hash
rename to buildroot/package/ipsec-tools/ipsec-tools.hash
diff --git a/software/package/ipsec-tools/ipsec-tools.mk b/buildroot/package/ipsec-tools/ipsec-tools.mk
similarity index 100%
rename from software/package/ipsec-tools/ipsec-tools.mk
rename to buildroot/package/ipsec-tools/ipsec-tools.mk
diff --git a/software/package/ipset/Config.in b/buildroot/package/ipset/Config.in
similarity index 100%
rename from software/package/ipset/Config.in
rename to buildroot/package/ipset/Config.in
diff --git a/software/package/ipset/ipset.hash b/buildroot/package/ipset/ipset.hash
similarity index 100%
rename from software/package/ipset/ipset.hash
rename to buildroot/package/ipset/ipset.hash
diff --git a/software/package/ipset/ipset.mk b/buildroot/package/ipset/ipset.mk
similarity index 100%
rename from software/package/ipset/ipset.mk
rename to buildroot/package/ipset/ipset.mk
diff --git a/software/package/iptables/Config.in b/buildroot/package/iptables/Config.in
similarity index 100%
rename from software/package/iptables/Config.in
rename to buildroot/package/iptables/Config.in
diff --git a/software/package/iptables/iptables.hash b/buildroot/package/iptables/iptables.hash
similarity index 100%
rename from software/package/iptables/iptables.hash
rename to buildroot/package/iptables/iptables.hash
diff --git a/software/package/iptables/iptables.mk b/buildroot/package/iptables/iptables.mk
similarity index 100%
rename from software/package/iptables/iptables.mk
rename to buildroot/package/iptables/iptables.mk
diff --git a/software/package/iptraf-ng/Config.in b/buildroot/package/iptraf-ng/Config.in
similarity index 100%
rename from software/package/iptraf-ng/Config.in
rename to buildroot/package/iptraf-ng/Config.in
diff --git a/software/package/iptraf-ng/iptraf-ng.hash b/buildroot/package/iptraf-ng/iptraf-ng.hash
similarity index 100%
rename from software/package/iptraf-ng/iptraf-ng.hash
rename to buildroot/package/iptraf-ng/iptraf-ng.hash
diff --git a/software/package/iptraf-ng/iptraf-ng.mk b/buildroot/package/iptraf-ng/iptraf-ng.mk
similarity index 100%
rename from software/package/iptraf-ng/iptraf-ng.mk
rename to buildroot/package/iptraf-ng/iptraf-ng.mk
diff --git a/software/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch b/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch
similarity index 100%
rename from software/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch
rename to buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch
diff --git a/software/package/iputils/Config.in b/buildroot/package/iputils/Config.in
similarity index 100%
rename from software/package/iputils/Config.in
rename to buildroot/package/iputils/Config.in
diff --git a/software/package/iputils/iputils.hash b/buildroot/package/iputils/iputils.hash
similarity index 100%
rename from software/package/iputils/iputils.hash
rename to buildroot/package/iputils/iputils.hash
diff --git a/software/package/iputils/iputils.mk b/buildroot/package/iputils/iputils.mk
similarity index 100%
rename from software/package/iputils/iputils.mk
rename to buildroot/package/iputils/iputils.mk
diff --git a/software/package/irda-utils/0001-daemon.patch b/buildroot/package/irda-utils/0001-daemon.patch
similarity index 100%
rename from software/package/irda-utils/0001-daemon.patch
rename to buildroot/package/irda-utils/0001-daemon.patch
diff --git a/software/package/irda-utils/0002-nommu.patch b/buildroot/package/irda-utils/0002-nommu.patch
similarity index 100%
rename from software/package/irda-utils/0002-nommu.patch
rename to buildroot/package/irda-utils/0002-nommu.patch
diff --git a/software/package/irda-utils/0003-subdir.patch b/buildroot/package/irda-utils/0003-subdir.patch
similarity index 100%
rename from software/package/irda-utils/0003-subdir.patch
rename to buildroot/package/irda-utils/0003-subdir.patch
diff --git a/software/package/irda-utils/0004-musl.patch b/buildroot/package/irda-utils/0004-musl.patch
similarity index 100%
rename from software/package/irda-utils/0004-musl.patch
rename to buildroot/package/irda-utils/0004-musl.patch
diff --git a/software/package/irda-utils/Config.in b/buildroot/package/irda-utils/Config.in
similarity index 100%
rename from software/package/irda-utils/Config.in
rename to buildroot/package/irda-utils/Config.in
diff --git a/software/package/irda-utils/irda-utils.hash b/buildroot/package/irda-utils/irda-utils.hash
similarity index 100%
rename from software/package/irda-utils/irda-utils.hash
rename to buildroot/package/irda-utils/irda-utils.hash
diff --git a/software/package/irda-utils/irda-utils.mk b/buildroot/package/irda-utils/irda-utils.mk
similarity index 100%
rename from software/package/irda-utils/irda-utils.mk
rename to buildroot/package/irda-utils/irda-utils.mk
diff --git a/software/package/irqbalance/Config.in b/buildroot/package/irqbalance/Config.in
similarity index 100%
rename from software/package/irqbalance/Config.in
rename to buildroot/package/irqbalance/Config.in
diff --git a/software/package/irqbalance/S13irqbalance b/buildroot/package/irqbalance/S13irqbalance
similarity index 100%
rename from software/package/irqbalance/S13irqbalance
rename to buildroot/package/irqbalance/S13irqbalance
diff --git a/software/package/irqbalance/irqbalance.hash b/buildroot/package/irqbalance/irqbalance.hash
similarity index 100%
rename from software/package/irqbalance/irqbalance.hash
rename to buildroot/package/irqbalance/irqbalance.hash
diff --git a/software/package/irqbalance/irqbalance.mk b/buildroot/package/irqbalance/irqbalance.mk
similarity index 100%
rename from software/package/irqbalance/irqbalance.mk
rename to buildroot/package/irqbalance/irqbalance.mk
diff --git a/software/package/irqbalance/irqbalance.service b/buildroot/package/irqbalance/irqbalance.service
similarity index 100%
rename from software/package/irqbalance/irqbalance.service
rename to buildroot/package/irqbalance/irqbalance.service
diff --git a/software/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch b/buildroot/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
similarity index 100%
rename from software/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
rename to buildroot/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
diff --git a/software/package/irrlicht/0002-remove-sys-sysctl.h.patch b/buildroot/package/irrlicht/0002-remove-sys-sysctl.h.patch
similarity index 100%
rename from software/package/irrlicht/0002-remove-sys-sysctl.h.patch
rename to buildroot/package/irrlicht/0002-remove-sys-sysctl.h.patch
diff --git a/software/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch b/buildroot/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch
similarity index 100%
rename from software/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch
rename to buildroot/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch
diff --git a/software/package/irrlicht/Config.in b/buildroot/package/irrlicht/Config.in
similarity index 100%
rename from software/package/irrlicht/Config.in
rename to buildroot/package/irrlicht/Config.in
diff --git a/software/package/irrlicht/irrlicht.hash b/buildroot/package/irrlicht/irrlicht.hash
similarity index 100%
rename from software/package/irrlicht/irrlicht.hash
rename to buildroot/package/irrlicht/irrlicht.hash
diff --git a/software/package/irrlicht/irrlicht.mk b/buildroot/package/irrlicht/irrlicht.mk
similarity index 100%
rename from software/package/irrlicht/irrlicht.mk
rename to buildroot/package/irrlicht/irrlicht.mk
diff --git a/software/package/irssi/Config.in b/buildroot/package/irssi/Config.in
similarity index 100%
rename from software/package/irssi/Config.in
rename to buildroot/package/irssi/Config.in
diff --git a/software/package/irssi/irssi.hash b/buildroot/package/irssi/irssi.hash
similarity index 100%
rename from software/package/irssi/irssi.hash
rename to buildroot/package/irssi/irssi.hash
diff --git a/software/package/irssi/irssi.mk b/buildroot/package/irssi/irssi.mk
similarity index 100%
rename from software/package/irssi/irssi.mk
rename to buildroot/package/irssi/irssi.mk
diff --git a/software/package/isl/isl.hash b/buildroot/package/isl/isl.hash
similarity index 100%
rename from software/package/isl/isl.hash
rename to buildroot/package/isl/isl.hash
diff --git a/software/package/isl/isl.mk b/buildroot/package/isl/isl.mk
similarity index 100%
rename from software/package/isl/isl.mk
rename to buildroot/package/isl/isl.mk
diff --git a/software/package/iucode-tool/Config.in b/buildroot/package/iucode-tool/Config.in
similarity index 100%
rename from software/package/iucode-tool/Config.in
rename to buildroot/package/iucode-tool/Config.in
diff --git a/software/package/iucode-tool/S00iucode-tool b/buildroot/package/iucode-tool/S00iucode-tool
similarity index 100%
rename from software/package/iucode-tool/S00iucode-tool
rename to buildroot/package/iucode-tool/S00iucode-tool
diff --git a/software/package/iucode-tool/iucode-tool.hash b/buildroot/package/iucode-tool/iucode-tool.hash
similarity index 100%
rename from software/package/iucode-tool/iucode-tool.hash
rename to buildroot/package/iucode-tool/iucode-tool.hash
diff --git a/software/package/iucode-tool/iucode-tool.mk b/buildroot/package/iucode-tool/iucode-tool.mk
similarity index 100%
rename from software/package/iucode-tool/iucode-tool.mk
rename to buildroot/package/iucode-tool/iucode-tool.mk
diff --git a/software/package/iucode-tool/iucode.service b/buildroot/package/iucode-tool/iucode.service
similarity index 100%
rename from software/package/iucode-tool/iucode.service
rename to buildroot/package/iucode-tool/iucode.service
diff --git a/software/package/iw/Config.in b/buildroot/package/iw/Config.in
similarity index 100%
rename from software/package/iw/Config.in
rename to buildroot/package/iw/Config.in
diff --git a/software/package/iw/iw.hash b/buildroot/package/iw/iw.hash
similarity index 100%
rename from software/package/iw/iw.hash
rename to buildroot/package/iw/iw.hash
diff --git a/software/package/iw/iw.mk b/buildroot/package/iw/iw.mk
similarity index 100%
rename from software/package/iw/iw.mk
rename to buildroot/package/iw/iw.mk
diff --git a/software/package/iwd/Config.in b/buildroot/package/iwd/Config.in
similarity index 100%
rename from software/package/iwd/Config.in
rename to buildroot/package/iwd/Config.in
diff --git a/software/package/iwd/iwd.hash b/buildroot/package/iwd/iwd.hash
similarity index 100%
rename from software/package/iwd/iwd.hash
rename to buildroot/package/iwd/iwd.hash
diff --git a/software/package/iwd/iwd.mk b/buildroot/package/iwd/iwd.mk
similarity index 100%
rename from software/package/iwd/iwd.mk
rename to buildroot/package/iwd/iwd.mk
diff --git a/software/package/jack1/Config.in b/buildroot/package/jack1/Config.in
similarity index 100%
rename from software/package/jack1/Config.in
rename to buildroot/package/jack1/Config.in
diff --git a/software/package/jack1/jack1.hash b/buildroot/package/jack1/jack1.hash
similarity index 100%
rename from software/package/jack1/jack1.hash
rename to buildroot/package/jack1/jack1.hash
diff --git a/software/package/jack1/jack1.mk b/buildroot/package/jack1/jack1.mk
similarity index 100%
rename from software/package/jack1/jack1.mk
rename to buildroot/package/jack1/jack1.mk
diff --git a/software/package/jack2/Config.in b/buildroot/package/jack2/Config.in
similarity index 100%
rename from software/package/jack2/Config.in
rename to buildroot/package/jack2/Config.in
diff --git a/software/package/jack2/jack2.hash b/buildroot/package/jack2/jack2.hash
similarity index 100%
rename from software/package/jack2/jack2.hash
rename to buildroot/package/jack2/jack2.hash
diff --git a/software/package/jack2/jack2.mk b/buildroot/package/jack2/jack2.mk
similarity index 100%
rename from software/package/jack2/jack2.mk
rename to buildroot/package/jack2/jack2.mk
diff --git a/software/package/jailhouse/Config.in b/buildroot/package/jailhouse/Config.in
similarity index 100%
rename from software/package/jailhouse/Config.in
rename to buildroot/package/jailhouse/Config.in
diff --git a/software/package/jailhouse/jailhouse.hash b/buildroot/package/jailhouse/jailhouse.hash
similarity index 100%
rename from software/package/jailhouse/jailhouse.hash
rename to buildroot/package/jailhouse/jailhouse.hash
diff --git a/software/package/jailhouse/jailhouse.mk b/buildroot/package/jailhouse/jailhouse.mk
similarity index 100%
rename from software/package/jailhouse/jailhouse.mk
rename to buildroot/package/jailhouse/jailhouse.mk
diff --git a/software/package/jansson/Config.in b/buildroot/package/jansson/Config.in
similarity index 100%
rename from software/package/jansson/Config.in
rename to buildroot/package/jansson/Config.in
diff --git a/software/package/jansson/jansson.hash b/buildroot/package/jansson/jansson.hash
similarity index 100%
rename from software/package/jansson/jansson.hash
rename to buildroot/package/jansson/jansson.hash
diff --git a/software/package/jansson/jansson.mk b/buildroot/package/jansson/jansson.mk
similarity index 100%
rename from software/package/jansson/jansson.mk
rename to buildroot/package/jansson/jansson.mk
diff --git a/software/package/janus-gateway/0001-disable-ssp.patch b/buildroot/package/janus-gateway/0001-disable-ssp.patch
similarity index 100%
rename from software/package/janus-gateway/0001-disable-ssp.patch
rename to buildroot/package/janus-gateway/0001-disable-ssp.patch
diff --git a/software/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch
similarity index 100%
rename from software/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch
rename to buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch
diff --git a/software/package/janus-gateway/Config.in b/buildroot/package/janus-gateway/Config.in
similarity index 100%
rename from software/package/janus-gateway/Config.in
rename to buildroot/package/janus-gateway/Config.in
diff --git a/software/package/janus-gateway/janus-gateway.hash b/buildroot/package/janus-gateway/janus-gateway.hash
similarity index 100%
rename from software/package/janus-gateway/janus-gateway.hash
rename to buildroot/package/janus-gateway/janus-gateway.hash
diff --git a/software/package/janus-gateway/janus-gateway.mk b/buildroot/package/janus-gateway/janus-gateway.mk
similarity index 100%
rename from software/package/janus-gateway/janus-gateway.mk
rename to buildroot/package/janus-gateway/janus-gateway.mk
diff --git a/software/package/jasper/Config.in b/buildroot/package/jasper/Config.in
similarity index 100%
rename from software/package/jasper/Config.in
rename to buildroot/package/jasper/Config.in
diff --git a/software/package/jasper/jasper.hash b/buildroot/package/jasper/jasper.hash
similarity index 100%
rename from software/package/jasper/jasper.hash
rename to buildroot/package/jasper/jasper.hash
diff --git a/software/package/jasper/jasper.mk b/buildroot/package/jasper/jasper.mk
similarity index 100%
rename from software/package/jasper/jasper.mk
rename to buildroot/package/jasper/jasper.mk
diff --git a/software/package/jemalloc/Config.in b/buildroot/package/jemalloc/Config.in
similarity index 100%
rename from software/package/jemalloc/Config.in
rename to buildroot/package/jemalloc/Config.in
diff --git a/software/package/jemalloc/jemalloc.hash b/buildroot/package/jemalloc/jemalloc.hash
similarity index 100%
rename from software/package/jemalloc/jemalloc.hash
rename to buildroot/package/jemalloc/jemalloc.hash
diff --git a/software/package/jemalloc/jemalloc.mk b/buildroot/package/jemalloc/jemalloc.mk
similarity index 100%
rename from software/package/jemalloc/jemalloc.mk
rename to buildroot/package/jemalloc/jemalloc.mk
diff --git a/software/package/jhead/Config.in b/buildroot/package/jhead/Config.in
similarity index 100%
rename from software/package/jhead/Config.in
rename to buildroot/package/jhead/Config.in
diff --git a/software/package/jhead/jhead.hash b/buildroot/package/jhead/jhead.hash
similarity index 100%
rename from software/package/jhead/jhead.hash
rename to buildroot/package/jhead/jhead.hash
diff --git a/software/package/jhead/jhead.mk b/buildroot/package/jhead/jhead.mk
similarity index 100%
rename from software/package/jhead/jhead.mk
rename to buildroot/package/jhead/jhead.mk
diff --git a/software/package/jimtcl/Config.in b/buildroot/package/jimtcl/Config.in
similarity index 100%
rename from software/package/jimtcl/Config.in
rename to buildroot/package/jimtcl/Config.in
diff --git a/software/package/jimtcl/jimtcl.hash b/buildroot/package/jimtcl/jimtcl.hash
similarity index 100%
rename from software/package/jimtcl/jimtcl.hash
rename to buildroot/package/jimtcl/jimtcl.hash
diff --git a/software/package/jimtcl/jimtcl.mk b/buildroot/package/jimtcl/jimtcl.mk
similarity index 100%
rename from software/package/jimtcl/jimtcl.mk
rename to buildroot/package/jimtcl/jimtcl.mk
diff --git a/software/package/jitterentropy-library/0001-Makefile-cleanup-install.patch b/buildroot/package/jitterentropy-library/0001-Makefile-cleanup-install.patch
similarity index 100%
rename from software/package/jitterentropy-library/0001-Makefile-cleanup-install.patch
rename to buildroot/package/jitterentropy-library/0001-Makefile-cleanup-install.patch
diff --git a/software/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch b/buildroot/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch
similarity index 100%
rename from software/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch
rename to buildroot/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch
diff --git a/software/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch b/buildroot/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch
similarity index 100%
rename from software/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch
rename to buildroot/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch
diff --git a/software/package/jitterentropy-library/Config.in b/buildroot/package/jitterentropy-library/Config.in
similarity index 100%
rename from software/package/jitterentropy-library/Config.in
rename to buildroot/package/jitterentropy-library/Config.in
diff --git a/software/package/jitterentropy-library/jitterentropy-library.hash b/buildroot/package/jitterentropy-library/jitterentropy-library.hash
similarity index 100%
rename from software/package/jitterentropy-library/jitterentropy-library.hash
rename to buildroot/package/jitterentropy-library/jitterentropy-library.hash
diff --git a/software/package/jitterentropy-library/jitterentropy-library.mk b/buildroot/package/jitterentropy-library/jitterentropy-library.mk
similarity index 100%
rename from software/package/jitterentropy-library/jitterentropy-library.mk
rename to buildroot/package/jitterentropy-library/jitterentropy-library.mk
diff --git a/software/package/jo/Config.in b/buildroot/package/jo/Config.in
similarity index 100%
rename from software/package/jo/Config.in
rename to buildroot/package/jo/Config.in
diff --git a/software/package/jo/jo.hash b/buildroot/package/jo/jo.hash
similarity index 100%
rename from software/package/jo/jo.hash
rename to buildroot/package/jo/jo.hash
diff --git a/software/package/jo/jo.mk b/buildroot/package/jo/jo.mk
similarity index 100%
rename from software/package/jo/jo.mk
rename to buildroot/package/jo/jo.mk
diff --git a/software/package/joe/Config.in b/buildroot/package/joe/Config.in
similarity index 100%
rename from software/package/joe/Config.in
rename to buildroot/package/joe/Config.in
diff --git a/software/package/joe/joe.hash b/buildroot/package/joe/joe.hash
similarity index 100%
rename from software/package/joe/joe.hash
rename to buildroot/package/joe/joe.hash
diff --git a/software/package/joe/joe.mk b/buildroot/package/joe/joe.mk
similarity index 100%
rename from software/package/joe/joe.mk
rename to buildroot/package/joe/joe.mk
diff --git a/software/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch b/buildroot/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch
similarity index 100%
rename from software/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch
rename to buildroot/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch
diff --git a/software/package/jose/0002-configure-fix-build-with-old-compilers.patch b/buildroot/package/jose/0002-configure-fix-build-with-old-compilers.patch
similarity index 100%
rename from software/package/jose/0002-configure-fix-build-with-old-compilers.patch
rename to buildroot/package/jose/0002-configure-fix-build-with-old-compilers.patch
diff --git a/software/package/jose/Config.in b/buildroot/package/jose/Config.in
similarity index 100%
rename from software/package/jose/Config.in
rename to buildroot/package/jose/Config.in
diff --git a/software/package/jose/jose.hash b/buildroot/package/jose/jose.hash
similarity index 100%
rename from software/package/jose/jose.hash
rename to buildroot/package/jose/jose.hash
diff --git a/software/package/jose/jose.mk b/buildroot/package/jose/jose.mk
similarity index 100%
rename from software/package/jose/jose.mk
rename to buildroot/package/jose/jose.mk
diff --git a/software/package/jpeg-turbo/jpeg-turbo.hash b/buildroot/package/jpeg-turbo/jpeg-turbo.hash
similarity index 100%
rename from software/package/jpeg-turbo/jpeg-turbo.hash
rename to buildroot/package/jpeg-turbo/jpeg-turbo.hash
diff --git a/software/package/jpeg-turbo/jpeg-turbo.mk b/buildroot/package/jpeg-turbo/jpeg-turbo.mk
similarity index 100%
rename from software/package/jpeg-turbo/jpeg-turbo.mk
rename to buildroot/package/jpeg-turbo/jpeg-turbo.mk
diff --git a/software/package/jpeg/Config.in b/buildroot/package/jpeg/Config.in
similarity index 100%
rename from software/package/jpeg/Config.in
rename to buildroot/package/jpeg/Config.in
diff --git a/software/package/jpeg/jpeg.mk b/buildroot/package/jpeg/jpeg.mk
similarity index 100%
rename from software/package/jpeg/jpeg.mk
rename to buildroot/package/jpeg/jpeg.mk
diff --git a/software/package/jq/Config.in b/buildroot/package/jq/Config.in
similarity index 100%
rename from software/package/jq/Config.in
rename to buildroot/package/jq/Config.in
diff --git a/software/package/jq/Config.in.host b/buildroot/package/jq/Config.in.host
similarity index 100%
rename from software/package/jq/Config.in.host
rename to buildroot/package/jq/Config.in.host
diff --git a/software/package/jq/jq.hash b/buildroot/package/jq/jq.hash
similarity index 100%
rename from software/package/jq/jq.hash
rename to buildroot/package/jq/jq.hash
diff --git a/software/package/jq/jq.mk b/buildroot/package/jq/jq.mk
similarity index 100%
rename from software/package/jq/jq.mk
rename to buildroot/package/jq/jq.mk
diff --git a/software/package/jquery-datetimepicker/Config.in b/buildroot/package/jquery-datetimepicker/Config.in
similarity index 100%
rename from software/package/jquery-datetimepicker/Config.in
rename to buildroot/package/jquery-datetimepicker/Config.in
diff --git a/software/package/jquery-datetimepicker/jquery-datetimepicker.hash b/buildroot/package/jquery-datetimepicker/jquery-datetimepicker.hash
similarity index 100%
rename from software/package/jquery-datetimepicker/jquery-datetimepicker.hash
rename to buildroot/package/jquery-datetimepicker/jquery-datetimepicker.hash
diff --git a/software/package/jquery-datetimepicker/jquery-datetimepicker.mk b/buildroot/package/jquery-datetimepicker/jquery-datetimepicker.mk
similarity index 100%
rename from software/package/jquery-datetimepicker/jquery-datetimepicker.mk
rename to buildroot/package/jquery-datetimepicker/jquery-datetimepicker.mk
diff --git a/software/package/jquery-keyboard/Config.in b/buildroot/package/jquery-keyboard/Config.in
similarity index 100%
rename from software/package/jquery-keyboard/Config.in
rename to buildroot/package/jquery-keyboard/Config.in
diff --git a/software/package/jquery-keyboard/jquery-keyboard.hash b/buildroot/package/jquery-keyboard/jquery-keyboard.hash
similarity index 100%
rename from software/package/jquery-keyboard/jquery-keyboard.hash
rename to buildroot/package/jquery-keyboard/jquery-keyboard.hash
diff --git a/software/package/jquery-keyboard/jquery-keyboard.mk b/buildroot/package/jquery-keyboard/jquery-keyboard.mk
similarity index 100%
rename from software/package/jquery-keyboard/jquery-keyboard.mk
rename to buildroot/package/jquery-keyboard/jquery-keyboard.mk
diff --git a/software/package/jquery-mobile/Config.in b/buildroot/package/jquery-mobile/Config.in
similarity index 100%
rename from software/package/jquery-mobile/Config.in
rename to buildroot/package/jquery-mobile/Config.in
diff --git a/software/package/jquery-mobile/jquery-mobile.hash b/buildroot/package/jquery-mobile/jquery-mobile.hash
similarity index 100%
rename from software/package/jquery-mobile/jquery-mobile.hash
rename to buildroot/package/jquery-mobile/jquery-mobile.hash
diff --git a/software/package/jquery-mobile/jquery-mobile.mk b/buildroot/package/jquery-mobile/jquery-mobile.mk
similarity index 100%
rename from software/package/jquery-mobile/jquery-mobile.mk
rename to buildroot/package/jquery-mobile/jquery-mobile.mk
diff --git a/software/package/jquery-sidebar/Config.in b/buildroot/package/jquery-sidebar/Config.in
similarity index 100%
rename from software/package/jquery-sidebar/Config.in
rename to buildroot/package/jquery-sidebar/Config.in
diff --git a/software/package/jquery-sidebar/jquery-sidebar.hash b/buildroot/package/jquery-sidebar/jquery-sidebar.hash
similarity index 100%
rename from software/package/jquery-sidebar/jquery-sidebar.hash
rename to buildroot/package/jquery-sidebar/jquery-sidebar.hash
diff --git a/software/package/jquery-sidebar/jquery-sidebar.mk b/buildroot/package/jquery-sidebar/jquery-sidebar.mk
similarity index 100%
rename from software/package/jquery-sidebar/jquery-sidebar.mk
rename to buildroot/package/jquery-sidebar/jquery-sidebar.mk
diff --git a/software/package/jquery-sparkline/Config.in b/buildroot/package/jquery-sparkline/Config.in
similarity index 100%
rename from software/package/jquery-sparkline/Config.in
rename to buildroot/package/jquery-sparkline/Config.in
diff --git a/software/package/jquery-sparkline/jquery-sparkline.hash b/buildroot/package/jquery-sparkline/jquery-sparkline.hash
similarity index 100%
rename from software/package/jquery-sparkline/jquery-sparkline.hash
rename to buildroot/package/jquery-sparkline/jquery-sparkline.hash
diff --git a/software/package/jquery-sparkline/jquery-sparkline.mk b/buildroot/package/jquery-sparkline/jquery-sparkline.mk
similarity index 100%
rename from software/package/jquery-sparkline/jquery-sparkline.mk
rename to buildroot/package/jquery-sparkline/jquery-sparkline.mk
diff --git a/software/package/jquery-ui-themes/Config.in b/buildroot/package/jquery-ui-themes/Config.in
similarity index 100%
rename from software/package/jquery-ui-themes/Config.in
rename to buildroot/package/jquery-ui-themes/Config.in
diff --git a/software/package/jquery-ui-themes/jquery-ui-themes.hash b/buildroot/package/jquery-ui-themes/jquery-ui-themes.hash
similarity index 100%
rename from software/package/jquery-ui-themes/jquery-ui-themes.hash
rename to buildroot/package/jquery-ui-themes/jquery-ui-themes.hash
diff --git a/software/package/jquery-ui-themes/jquery-ui-themes.mk b/buildroot/package/jquery-ui-themes/jquery-ui-themes.mk
similarity index 100%
rename from software/package/jquery-ui-themes/jquery-ui-themes.mk
rename to buildroot/package/jquery-ui-themes/jquery-ui-themes.mk
diff --git a/software/package/jquery-ui/Config.in b/buildroot/package/jquery-ui/Config.in
similarity index 100%
rename from software/package/jquery-ui/Config.in
rename to buildroot/package/jquery-ui/Config.in
diff --git a/software/package/jquery-ui/jquery-ui.hash b/buildroot/package/jquery-ui/jquery-ui.hash
similarity index 100%
rename from software/package/jquery-ui/jquery-ui.hash
rename to buildroot/package/jquery-ui/jquery-ui.hash
diff --git a/software/package/jquery-ui/jquery-ui.mk b/buildroot/package/jquery-ui/jquery-ui.mk
similarity index 100%
rename from software/package/jquery-ui/jquery-ui.mk
rename to buildroot/package/jquery-ui/jquery-ui.mk
diff --git a/software/package/jquery-validation/Config.in b/buildroot/package/jquery-validation/Config.in
similarity index 100%
rename from software/package/jquery-validation/Config.in
rename to buildroot/package/jquery-validation/Config.in
diff --git a/software/package/jquery-validation/jquery-validation.hash b/buildroot/package/jquery-validation/jquery-validation.hash
similarity index 100%
rename from software/package/jquery-validation/jquery-validation.hash
rename to buildroot/package/jquery-validation/jquery-validation.hash
diff --git a/software/package/jquery-validation/jquery-validation.mk b/buildroot/package/jquery-validation/jquery-validation.mk
similarity index 100%
rename from software/package/jquery-validation/jquery-validation.mk
rename to buildroot/package/jquery-validation/jquery-validation.mk
diff --git a/software/package/jquery/Config.in b/buildroot/package/jquery/Config.in
similarity index 100%
rename from software/package/jquery/Config.in
rename to buildroot/package/jquery/Config.in
diff --git a/software/package/jquery/jquery.hash b/buildroot/package/jquery/jquery.hash
similarity index 100%
rename from software/package/jquery/jquery.hash
rename to buildroot/package/jquery/jquery.hash
diff --git a/software/package/jquery/jquery.mk b/buildroot/package/jquery/jquery.mk
similarity index 100%
rename from software/package/jquery/jquery.mk
rename to buildroot/package/jquery/jquery.mk
diff --git a/software/package/jsmin/Config.in b/buildroot/package/jsmin/Config.in
similarity index 100%
rename from software/package/jsmin/Config.in
rename to buildroot/package/jsmin/Config.in
diff --git a/software/package/jsmin/Config.in.host b/buildroot/package/jsmin/Config.in.host
similarity index 100%
rename from software/package/jsmin/Config.in.host
rename to buildroot/package/jsmin/Config.in.host
diff --git a/software/package/jsmin/jsmin.hash b/buildroot/package/jsmin/jsmin.hash
similarity index 100%
rename from software/package/jsmin/jsmin.hash
rename to buildroot/package/jsmin/jsmin.hash
diff --git a/software/package/jsmin/jsmin.mk b/buildroot/package/jsmin/jsmin.mk
similarity index 100%
rename from software/package/jsmin/jsmin.mk
rename to buildroot/package/jsmin/jsmin.mk
diff --git a/software/package/jsmn/Config.in b/buildroot/package/jsmn/Config.in
similarity index 100%
rename from software/package/jsmn/Config.in
rename to buildroot/package/jsmn/Config.in
diff --git a/software/package/jsmn/jsmn.hash b/buildroot/package/jsmn/jsmn.hash
similarity index 100%
rename from software/package/jsmn/jsmn.hash
rename to buildroot/package/jsmn/jsmn.hash
diff --git a/software/package/jsmn/jsmn.mk b/buildroot/package/jsmn/jsmn.mk
similarity index 100%
rename from software/package/jsmn/jsmn.mk
rename to buildroot/package/jsmn/jsmn.mk
diff --git a/software/package/json-c/Config.in b/buildroot/package/json-c/Config.in
similarity index 100%
rename from software/package/json-c/Config.in
rename to buildroot/package/json-c/Config.in
diff --git a/software/package/json-c/json-c.hash b/buildroot/package/json-c/json-c.hash
similarity index 100%
rename from software/package/json-c/json-c.hash
rename to buildroot/package/json-c/json-c.hash
diff --git a/software/package/json-c/json-c.mk b/buildroot/package/json-c/json-c.mk
similarity index 100%
rename from software/package/json-c/json-c.mk
rename to buildroot/package/json-c/json-c.mk
diff --git a/software/package/json-for-modern-cpp/Config.in b/buildroot/package/json-for-modern-cpp/Config.in
similarity index 100%
rename from software/package/json-for-modern-cpp/Config.in
rename to buildroot/package/json-for-modern-cpp/Config.in
diff --git a/software/package/json-for-modern-cpp/json-for-modern-cpp.hash b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
similarity index 100%
rename from software/package/json-for-modern-cpp/json-for-modern-cpp.hash
rename to buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
diff --git a/software/package/json-for-modern-cpp/json-for-modern-cpp.mk b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
similarity index 100%
rename from software/package/json-for-modern-cpp/json-for-modern-cpp.mk
rename to buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
diff --git a/software/package/json-glib/Config.in b/buildroot/package/json-glib/Config.in
similarity index 100%
rename from software/package/json-glib/Config.in
rename to buildroot/package/json-glib/Config.in
diff --git a/software/package/json-glib/json-glib.hash b/buildroot/package/json-glib/json-glib.hash
similarity index 100%
rename from software/package/json-glib/json-glib.hash
rename to buildroot/package/json-glib/json-glib.hash
diff --git a/software/package/json-glib/json-glib.mk b/buildroot/package/json-glib/json-glib.mk
similarity index 100%
rename from software/package/json-glib/json-glib.mk
rename to buildroot/package/json-glib/json-glib.mk
diff --git a/software/package/json-javascript/Config.in b/buildroot/package/json-javascript/Config.in
similarity index 100%
rename from software/package/json-javascript/Config.in
rename to buildroot/package/json-javascript/Config.in
diff --git a/software/package/json-javascript/json-javascript.hash b/buildroot/package/json-javascript/json-javascript.hash
similarity index 100%
rename from software/package/json-javascript/json-javascript.hash
rename to buildroot/package/json-javascript/json-javascript.hash
diff --git a/software/package/json-javascript/json-javascript.mk b/buildroot/package/json-javascript/json-javascript.mk
similarity index 100%
rename from software/package/json-javascript/json-javascript.mk
rename to buildroot/package/json-javascript/json-javascript.mk
diff --git a/software/package/jsoncpp/0001-Meson-updates.patch b/buildroot/package/jsoncpp/0001-Meson-updates.patch
similarity index 100%
rename from software/package/jsoncpp/0001-Meson-updates.patch
rename to buildroot/package/jsoncpp/0001-Meson-updates.patch
diff --git a/software/package/jsoncpp/Config.in b/buildroot/package/jsoncpp/Config.in
similarity index 100%
rename from software/package/jsoncpp/Config.in
rename to buildroot/package/jsoncpp/Config.in
diff --git a/software/package/jsoncpp/jsoncpp.hash b/buildroot/package/jsoncpp/jsoncpp.hash
similarity index 100%
rename from software/package/jsoncpp/jsoncpp.hash
rename to buildroot/package/jsoncpp/jsoncpp.hash
diff --git a/software/package/jsoncpp/jsoncpp.mk b/buildroot/package/jsoncpp/jsoncpp.mk
similarity index 100%
rename from software/package/jsoncpp/jsoncpp.mk
rename to buildroot/package/jsoncpp/jsoncpp.mk
diff --git a/software/package/kbd/Config.in b/buildroot/package/kbd/Config.in
similarity index 100%
rename from software/package/kbd/Config.in
rename to buildroot/package/kbd/Config.in
diff --git a/software/package/kbd/kbd.hash b/buildroot/package/kbd/kbd.hash
similarity index 100%
rename from software/package/kbd/kbd.hash
rename to buildroot/package/kbd/kbd.hash
diff --git a/software/package/kbd/kbd.mk b/buildroot/package/kbd/kbd.mk
similarity index 100%
rename from software/package/kbd/kbd.mk
rename to buildroot/package/kbd/kbd.mk
diff --git a/software/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch b/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch
similarity index 100%
rename from software/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch
rename to buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch
diff --git a/software/package/keepalived/Config.in b/buildroot/package/keepalived/Config.in
similarity index 100%
rename from software/package/keepalived/Config.in
rename to buildroot/package/keepalived/Config.in
diff --git a/software/package/keepalived/keepalived.hash b/buildroot/package/keepalived/keepalived.hash
similarity index 100%
rename from software/package/keepalived/keepalived.hash
rename to buildroot/package/keepalived/keepalived.hash
diff --git a/software/package/keepalived/keepalived.mk b/buildroot/package/keepalived/keepalived.mk
similarity index 100%
rename from software/package/keepalived/keepalived.mk
rename to buildroot/package/keepalived/keepalived.mk
diff --git a/software/package/kexec-lite/0001-clean-restart.patch b/buildroot/package/kexec-lite/0001-clean-restart.patch
similarity index 100%
rename from software/package/kexec-lite/0001-clean-restart.patch
rename to buildroot/package/kexec-lite/0001-clean-restart.patch
diff --git a/software/package/kexec-lite/Config.in b/buildroot/package/kexec-lite/Config.in
similarity index 100%
rename from software/package/kexec-lite/Config.in
rename to buildroot/package/kexec-lite/Config.in
diff --git a/software/package/kexec-lite/kexec-lite.hash b/buildroot/package/kexec-lite/kexec-lite.hash
similarity index 100%
rename from software/package/kexec-lite/kexec-lite.hash
rename to buildroot/package/kexec-lite/kexec-lite.hash
diff --git a/software/package/kexec-lite/kexec-lite.mk b/buildroot/package/kexec-lite/kexec-lite.mk
similarity index 100%
rename from software/package/kexec-lite/kexec-lite.mk
rename to buildroot/package/kexec-lite/kexec-lite.mk
diff --git a/software/package/kexec/Config.in b/buildroot/package/kexec/Config.in
similarity index 100%
rename from software/package/kexec/Config.in
rename to buildroot/package/kexec/Config.in
diff --git a/software/package/kexec/kexec.hash b/buildroot/package/kexec/kexec.hash
similarity index 100%
rename from software/package/kexec/kexec.hash
rename to buildroot/package/kexec/kexec.hash
diff --git a/software/package/kexec/kexec.mk b/buildroot/package/kexec/kexec.mk
similarity index 100%
rename from software/package/kexec/kexec.mk
rename to buildroot/package/kexec/kexec.mk
diff --git a/software/package/keyutils/0001-fix-install-rule.patch b/buildroot/package/keyutils/0001-fix-install-rule.patch
similarity index 100%
rename from software/package/keyutils/0001-fix-install-rule.patch
rename to buildroot/package/keyutils/0001-fix-install-rule.patch
diff --git a/software/package/keyutils/0002-cifs.patch b/buildroot/package/keyutils/0002-cifs.patch
similarity index 100%
rename from software/package/keyutils/0002-cifs.patch
rename to buildroot/package/keyutils/0002-cifs.patch
diff --git a/software/package/keyutils/Config.in b/buildroot/package/keyutils/Config.in
similarity index 100%
rename from software/package/keyutils/Config.in
rename to buildroot/package/keyutils/Config.in
diff --git a/software/package/keyutils/keyutils.hash b/buildroot/package/keyutils/keyutils.hash
similarity index 100%
rename from software/package/keyutils/keyutils.hash
rename to buildroot/package/keyutils/keyutils.hash
diff --git a/software/package/keyutils/keyutils.mk b/buildroot/package/keyutils/keyutils.mk
similarity index 100%
rename from software/package/keyutils/keyutils.mk
rename to buildroot/package/keyutils/keyutils.mk
diff --git a/software/package/kf5/Config.in b/buildroot/package/kf5/Config.in
similarity index 100%
rename from software/package/kf5/Config.in
rename to buildroot/package/kf5/Config.in
diff --git a/software/package/kf5/kf5-extra-cmake-modules/Config.in b/buildroot/package/kf5/kf5-extra-cmake-modules/Config.in
similarity index 100%
rename from software/package/kf5/kf5-extra-cmake-modules/Config.in
rename to buildroot/package/kf5/kf5-extra-cmake-modules/Config.in
diff --git a/software/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/buildroot/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
similarity index 100%
rename from software/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
rename to buildroot/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
diff --git a/software/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/buildroot/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
similarity index 100%
rename from software/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
rename to buildroot/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
diff --git a/software/package/kf5/kf5-kcoreaddons/Config.in b/buildroot/package/kf5/kf5-kcoreaddons/Config.in
similarity index 100%
rename from software/package/kf5/kf5-kcoreaddons/Config.in
rename to buildroot/package/kf5/kf5-kcoreaddons/Config.in
diff --git a/software/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
similarity index 100%
rename from software/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
rename to buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
diff --git a/software/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
similarity index 100%
rename from software/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
rename to buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
diff --git a/software/package/kf5/kf5-modemmanager-qt/Config.in b/buildroot/package/kf5/kf5-modemmanager-qt/Config.in
similarity index 100%
rename from software/package/kf5/kf5-modemmanager-qt/Config.in
rename to buildroot/package/kf5/kf5-modemmanager-qt/Config.in
diff --git a/software/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash
similarity index 100%
rename from software/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash
rename to buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash
diff --git a/software/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk
similarity index 100%
rename from software/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk
rename to buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk
diff --git a/software/package/kf5/kf5-networkmanager-qt/Config.in b/buildroot/package/kf5/kf5-networkmanager-qt/Config.in
similarity index 100%
rename from software/package/kf5/kf5-networkmanager-qt/Config.in
rename to buildroot/package/kf5/kf5-networkmanager-qt/Config.in
diff --git a/software/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/buildroot/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
similarity index 100%
rename from software/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
rename to buildroot/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
diff --git a/software/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/buildroot/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk
similarity index 100%
rename from software/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk
rename to buildroot/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk
diff --git a/software/package/kf5/kf5.mk b/buildroot/package/kf5/kf5.mk
similarity index 100%
rename from software/package/kf5/kf5.mk
rename to buildroot/package/kf5/kf5.mk
diff --git a/software/package/kismet/0001-ncurses.patch b/buildroot/package/kismet/0001-ncurses.patch
similarity index 100%
rename from software/package/kismet/0001-ncurses.patch
rename to buildroot/package/kismet/0001-ncurses.patch
diff --git a/software/package/kismet/0002-nobsd.patch b/buildroot/package/kismet/0002-nobsd.patch
similarity index 100%
rename from software/package/kismet/0002-nobsd.patch
rename to buildroot/package/kismet/0002-nobsd.patch
diff --git a/software/package/kismet/0003-fix-curses-libs-ordering.patch b/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch
similarity index 100%
rename from software/package/kismet/0003-fix-curses-libs-ordering.patch
rename to buildroot/package/kismet/0003-fix-curses-libs-ordering.patch
diff --git a/software/package/kismet/0004-no-include-host-paths.patch b/buildroot/package/kismet/0004-no-include-host-paths.patch
similarity index 100%
rename from software/package/kismet/0004-no-include-host-paths.patch
rename to buildroot/package/kismet/0004-no-include-host-paths.patch
diff --git a/software/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch b/buildroot/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch
similarity index 100%
rename from software/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch
rename to buildroot/package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch
diff --git a/software/package/kismet/Config.in b/buildroot/package/kismet/Config.in
similarity index 100%
rename from software/package/kismet/Config.in
rename to buildroot/package/kismet/Config.in
diff --git a/software/package/kismet/kismet.hash b/buildroot/package/kismet/kismet.hash
similarity index 100%
rename from software/package/kismet/kismet.hash
rename to buildroot/package/kismet/kismet.hash
diff --git a/software/package/kismet/kismet.mk b/buildroot/package/kismet/kismet.mk
similarity index 100%
rename from software/package/kismet/kismet.mk
rename to buildroot/package/kismet/kismet.mk
diff --git a/software/package/kmod/0001-fix-O_CLOEXEC.patch b/buildroot/package/kmod/0001-fix-O_CLOEXEC.patch
similarity index 100%
rename from software/package/kmod/0001-fix-O_CLOEXEC.patch
rename to buildroot/package/kmod/0001-fix-O_CLOEXEC.patch
diff --git a/software/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch b/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch
similarity index 100%
rename from software/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch
rename to buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch
diff --git a/software/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch b/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch
similarity index 100%
rename from software/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch
rename to buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch
diff --git a/software/package/kmod/Config.in b/buildroot/package/kmod/Config.in
similarity index 100%
rename from software/package/kmod/Config.in
rename to buildroot/package/kmod/Config.in
diff --git a/software/package/kmod/kmod.hash b/buildroot/package/kmod/kmod.hash
similarity index 100%
rename from software/package/kmod/kmod.hash
rename to buildroot/package/kmod/kmod.hash
diff --git a/software/package/kmod/kmod.mk b/buildroot/package/kmod/kmod.mk
similarity index 100%
rename from software/package/kmod/kmod.mk
rename to buildroot/package/kmod/kmod.mk
diff --git a/software/package/kmscube/Config.in b/buildroot/package/kmscube/Config.in
similarity index 100%
rename from software/package/kmscube/Config.in
rename to buildroot/package/kmscube/Config.in
diff --git a/software/package/kmscube/kmscube.hash b/buildroot/package/kmscube/kmscube.hash
similarity index 100%
rename from software/package/kmscube/kmscube.hash
rename to buildroot/package/kmscube/kmscube.hash
diff --git a/software/package/kmscube/kmscube.mk b/buildroot/package/kmscube/kmscube.mk
similarity index 100%
rename from software/package/kmscube/kmscube.mk
rename to buildroot/package/kmscube/kmscube.mk
diff --git a/software/package/kmsxx/Config.in b/buildroot/package/kmsxx/Config.in
similarity index 100%
rename from software/package/kmsxx/Config.in
rename to buildroot/package/kmsxx/Config.in
diff --git a/software/package/kmsxx/kmsxx.hash b/buildroot/package/kmsxx/kmsxx.hash
similarity index 100%
rename from software/package/kmsxx/kmsxx.hash
rename to buildroot/package/kmsxx/kmsxx.hash
diff --git a/software/package/kmsxx/kmsxx.mk b/buildroot/package/kmsxx/kmsxx.mk
similarity index 100%
rename from software/package/kmsxx/kmsxx.mk
rename to buildroot/package/kmsxx/kmsxx.mk
diff --git a/software/package/knock/Config.in b/buildroot/package/knock/Config.in
similarity index 100%
rename from software/package/knock/Config.in
rename to buildroot/package/knock/Config.in
diff --git a/software/package/knock/knock.hash b/buildroot/package/knock/knock.hash
similarity index 100%
rename from software/package/knock/knock.hash
rename to buildroot/package/knock/knock.hash
diff --git a/software/package/knock/knock.mk b/buildroot/package/knock/knock.mk
similarity index 100%
rename from software/package/knock/knock.mk
rename to buildroot/package/knock/knock.mk
diff --git a/software/package/kodi-audiodecoder-modplug/Config.in b/buildroot/package/kodi-audiodecoder-modplug/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-modplug/Config.in
rename to buildroot/package/kodi-audiodecoder-modplug/Config.in
diff --git a/software/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
rename to buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
diff --git a/software/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
rename to buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
diff --git a/software/package/kodi-audiodecoder-nosefart/Config.in b/buildroot/package/kodi-audiodecoder-nosefart/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-nosefart/Config.in
rename to buildroot/package/kodi-audiodecoder-nosefart/Config.in
diff --git a/software/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
rename to buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
diff --git a/software/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
rename to buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
diff --git a/software/package/kodi-audiodecoder-sidplay/Config.in b/buildroot/package/kodi-audiodecoder-sidplay/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-sidplay/Config.in
rename to buildroot/package/kodi-audiodecoder-sidplay/Config.in
diff --git a/software/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
rename to buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
diff --git a/software/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
rename to buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
diff --git a/software/package/kodi-audiodecoder-snesapu/Config.in b/buildroot/package/kodi-audiodecoder-snesapu/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-snesapu/Config.in
rename to buildroot/package/kodi-audiodecoder-snesapu/Config.in
diff --git a/software/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
rename to buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
diff --git a/software/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
rename to buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
diff --git a/software/package/kodi-audiodecoder-stsound/Config.in b/buildroot/package/kodi-audiodecoder-stsound/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-stsound/Config.in
rename to buildroot/package/kodi-audiodecoder-stsound/Config.in
diff --git a/software/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
rename to buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
diff --git a/software/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
rename to buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
diff --git a/software/package/kodi-audiodecoder-timidity/Config.in b/buildroot/package/kodi-audiodecoder-timidity/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-timidity/Config.in
rename to buildroot/package/kodi-audiodecoder-timidity/Config.in
diff --git a/software/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
rename to buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
diff --git a/software/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
rename to buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
diff --git a/software/package/kodi-audiodecoder-vgmstream/Config.in b/buildroot/package/kodi-audiodecoder-vgmstream/Config.in
similarity index 100%
rename from software/package/kodi-audiodecoder-vgmstream/Config.in
rename to buildroot/package/kodi-audiodecoder-vgmstream/Config.in
diff --git a/software/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
similarity index 100%
rename from software/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
rename to buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
diff --git a/software/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
similarity index 100%
rename from software/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
rename to buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
diff --git a/software/package/kodi-audioencoder-flac/Config.in b/buildroot/package/kodi-audioencoder-flac/Config.in
similarity index 100%
rename from software/package/kodi-audioencoder-flac/Config.in
rename to buildroot/package/kodi-audioencoder-flac/Config.in
diff --git a/software/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
similarity index 100%
rename from software/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
rename to buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
diff --git a/software/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
similarity index 100%
rename from software/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
rename to buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
diff --git a/software/package/kodi-audioencoder-lame/Config.in b/buildroot/package/kodi-audioencoder-lame/Config.in
similarity index 100%
rename from software/package/kodi-audioencoder-lame/Config.in
rename to buildroot/package/kodi-audioencoder-lame/Config.in
diff --git a/software/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
similarity index 100%
rename from software/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
rename to buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
diff --git a/software/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
similarity index 100%
rename from software/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
rename to buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
diff --git a/software/package/kodi-audioencoder-vorbis/Config.in b/buildroot/package/kodi-audioencoder-vorbis/Config.in
similarity index 100%
rename from software/package/kodi-audioencoder-vorbis/Config.in
rename to buildroot/package/kodi-audioencoder-vorbis/Config.in
diff --git a/software/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
similarity index 100%
rename from software/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
rename to buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
diff --git a/software/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
similarity index 100%
rename from software/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
rename to buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
diff --git a/software/package/kodi-audioencoder-wav/Config.in b/buildroot/package/kodi-audioencoder-wav/Config.in
similarity index 100%
rename from software/package/kodi-audioencoder-wav/Config.in
rename to buildroot/package/kodi-audioencoder-wav/Config.in
diff --git a/software/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
similarity index 100%
rename from software/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
rename to buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
diff --git a/software/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
similarity index 100%
rename from software/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
rename to buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
diff --git a/software/package/kodi-inputstream-adaptive/Config.in b/buildroot/package/kodi-inputstream-adaptive/Config.in
similarity index 100%
rename from software/package/kodi-inputstream-adaptive/Config.in
rename to buildroot/package/kodi-inputstream-adaptive/Config.in
diff --git a/software/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
similarity index 100%
rename from software/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
rename to buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
diff --git a/software/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
similarity index 100%
rename from software/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
rename to buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
diff --git a/software/package/kodi-inputstream-rtmp/Config.in b/buildroot/package/kodi-inputstream-rtmp/Config.in
similarity index 100%
rename from software/package/kodi-inputstream-rtmp/Config.in
rename to buildroot/package/kodi-inputstream-rtmp/Config.in
diff --git a/software/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
similarity index 100%
rename from software/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
rename to buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
diff --git a/software/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
similarity index 100%
rename from software/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
rename to buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
diff --git a/software/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash b/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
similarity index 100%
rename from software/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
rename to buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
diff --git a/software/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
similarity index 100%
rename from software/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
rename to buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
diff --git a/software/package/kodi-peripheral-joystick/Config.in b/buildroot/package/kodi-peripheral-joystick/Config.in
similarity index 100%
rename from software/package/kodi-peripheral-joystick/Config.in
rename to buildroot/package/kodi-peripheral-joystick/Config.in
diff --git a/software/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
similarity index 100%
rename from software/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
rename to buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
diff --git a/software/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
similarity index 100%
rename from software/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
rename to buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
diff --git a/software/package/kodi-peripheral-steamcontroller/Config.in b/buildroot/package/kodi-peripheral-steamcontroller/Config.in
similarity index 100%
rename from software/package/kodi-peripheral-steamcontroller/Config.in
rename to buildroot/package/kodi-peripheral-steamcontroller/Config.in
diff --git a/software/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
similarity index 100%
rename from software/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
rename to buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
diff --git a/software/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
similarity index 100%
rename from software/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
rename to buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
diff --git a/software/package/kodi-peripheral-xarcade/Config.in b/buildroot/package/kodi-peripheral-xarcade/Config.in
similarity index 100%
rename from software/package/kodi-peripheral-xarcade/Config.in
rename to buildroot/package/kodi-peripheral-xarcade/Config.in
diff --git a/software/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
similarity index 100%
rename from software/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
rename to buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
diff --git a/software/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
similarity index 100%
rename from software/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
rename to buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
diff --git a/software/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch b/buildroot/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch
similarity index 100%
rename from software/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch
rename to buildroot/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch
diff --git a/software/package/kodi-platform/Config.in b/buildroot/package/kodi-platform/Config.in
similarity index 100%
rename from software/package/kodi-platform/Config.in
rename to buildroot/package/kodi-platform/Config.in
diff --git a/software/package/kodi-platform/kodi-platform.hash b/buildroot/package/kodi-platform/kodi-platform.hash
similarity index 100%
rename from software/package/kodi-platform/kodi-platform.hash
rename to buildroot/package/kodi-platform/kodi-platform.hash
diff --git a/software/package/kodi-platform/kodi-platform.mk b/buildroot/package/kodi-platform/kodi-platform.mk
similarity index 100%
rename from software/package/kodi-platform/kodi-platform.mk
rename to buildroot/package/kodi-platform/kodi-platform.mk
diff --git a/software/package/kodi-pvr-argustv/Config.in b/buildroot/package/kodi-pvr-argustv/Config.in
similarity index 100%
rename from software/package/kodi-pvr-argustv/Config.in
rename to buildroot/package/kodi-pvr-argustv/Config.in
diff --git a/software/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
similarity index 100%
rename from software/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
rename to buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
diff --git a/software/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
similarity index 100%
rename from software/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
rename to buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
diff --git a/software/package/kodi-pvr-dvblink/Config.in b/buildroot/package/kodi-pvr-dvblink/Config.in
similarity index 100%
rename from software/package/kodi-pvr-dvblink/Config.in
rename to buildroot/package/kodi-pvr-dvblink/Config.in
diff --git a/software/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
similarity index 100%
rename from software/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
rename to buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
diff --git a/software/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
similarity index 100%
rename from software/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
rename to buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
diff --git a/software/package/kodi-pvr-dvbviewer/Config.in b/buildroot/package/kodi-pvr-dvbviewer/Config.in
similarity index 100%
rename from software/package/kodi-pvr-dvbviewer/Config.in
rename to buildroot/package/kodi-pvr-dvbviewer/Config.in
diff --git a/software/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
similarity index 100%
rename from software/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
rename to buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
diff --git a/software/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
similarity index 100%
rename from software/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
rename to buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
diff --git a/software/package/kodi-pvr-filmon/Config.in b/buildroot/package/kodi-pvr-filmon/Config.in
similarity index 100%
rename from software/package/kodi-pvr-filmon/Config.in
rename to buildroot/package/kodi-pvr-filmon/Config.in
diff --git a/software/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
similarity index 100%
rename from software/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
rename to buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
diff --git a/software/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
similarity index 100%
rename from software/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
rename to buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
diff --git a/software/package/kodi-pvr-hdhomerun/Config.in b/buildroot/package/kodi-pvr-hdhomerun/Config.in
similarity index 100%
rename from software/package/kodi-pvr-hdhomerun/Config.in
rename to buildroot/package/kodi-pvr-hdhomerun/Config.in
diff --git a/software/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
similarity index 100%
rename from software/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
rename to buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
diff --git a/software/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
similarity index 100%
rename from software/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
rename to buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
diff --git a/software/package/kodi-pvr-hts/Config.in b/buildroot/package/kodi-pvr-hts/Config.in
similarity index 100%
rename from software/package/kodi-pvr-hts/Config.in
rename to buildroot/package/kodi-pvr-hts/Config.in
diff --git a/software/package/kodi-pvr-hts/kodi-pvr-hts.hash b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash
similarity index 100%
rename from software/package/kodi-pvr-hts/kodi-pvr-hts.hash
rename to buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash
diff --git a/software/package/kodi-pvr-hts/kodi-pvr-hts.mk b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk
similarity index 100%
rename from software/package/kodi-pvr-hts/kodi-pvr-hts.mk
rename to buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk
diff --git a/software/package/kodi-pvr-iptvsimple/Config.in b/buildroot/package/kodi-pvr-iptvsimple/Config.in
similarity index 100%
rename from software/package/kodi-pvr-iptvsimple/Config.in
rename to buildroot/package/kodi-pvr-iptvsimple/Config.in
diff --git a/software/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
similarity index 100%
rename from software/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
rename to buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
diff --git a/software/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
similarity index 100%
rename from software/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
rename to buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
diff --git a/software/package/kodi-pvr-mediaportal-tvserver/Config.in b/buildroot/package/kodi-pvr-mediaportal-tvserver/Config.in
similarity index 100%
rename from software/package/kodi-pvr-mediaportal-tvserver/Config.in
rename to buildroot/package/kodi-pvr-mediaportal-tvserver/Config.in
diff --git a/software/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
similarity index 100%
rename from software/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
rename to buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
diff --git a/software/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
similarity index 100%
rename from software/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
rename to buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
diff --git a/software/package/kodi-pvr-mythtv/Config.in b/buildroot/package/kodi-pvr-mythtv/Config.in
similarity index 100%
rename from software/package/kodi-pvr-mythtv/Config.in
rename to buildroot/package/kodi-pvr-mythtv/Config.in
diff --git a/software/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
similarity index 100%
rename from software/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
rename to buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
diff --git a/software/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
similarity index 100%
rename from software/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
rename to buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
diff --git a/software/package/kodi-pvr-nextpvr/Config.in b/buildroot/package/kodi-pvr-nextpvr/Config.in
similarity index 100%
rename from software/package/kodi-pvr-nextpvr/Config.in
rename to buildroot/package/kodi-pvr-nextpvr/Config.in
diff --git a/software/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
similarity index 100%
rename from software/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
rename to buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
diff --git a/software/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
similarity index 100%
rename from software/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
rename to buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
diff --git a/software/package/kodi-pvr-njoy/Config.in b/buildroot/package/kodi-pvr-njoy/Config.in
similarity index 100%
rename from software/package/kodi-pvr-njoy/Config.in
rename to buildroot/package/kodi-pvr-njoy/Config.in
diff --git a/software/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
similarity index 100%
rename from software/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
rename to buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
diff --git a/software/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
similarity index 100%
rename from software/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
rename to buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
diff --git a/software/package/kodi-pvr-pctv/Config.in b/buildroot/package/kodi-pvr-pctv/Config.in
similarity index 100%
rename from software/package/kodi-pvr-pctv/Config.in
rename to buildroot/package/kodi-pvr-pctv/Config.in
diff --git a/software/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
similarity index 100%
rename from software/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
rename to buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
diff --git a/software/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
similarity index 100%
rename from software/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
rename to buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
diff --git a/software/package/kodi-pvr-stalker/Config.in b/buildroot/package/kodi-pvr-stalker/Config.in
similarity index 100%
rename from software/package/kodi-pvr-stalker/Config.in
rename to buildroot/package/kodi-pvr-stalker/Config.in
diff --git a/software/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
similarity index 100%
rename from software/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
rename to buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
diff --git a/software/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
similarity index 100%
rename from software/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
rename to buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
diff --git a/software/package/kodi-pvr-vbox/Config.in b/buildroot/package/kodi-pvr-vbox/Config.in
similarity index 100%
rename from software/package/kodi-pvr-vbox/Config.in
rename to buildroot/package/kodi-pvr-vbox/Config.in
diff --git a/software/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
similarity index 100%
rename from software/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
rename to buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
diff --git a/software/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
similarity index 100%
rename from software/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
rename to buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
diff --git a/software/package/kodi-pvr-vdr-vnsi/Config.in b/buildroot/package/kodi-pvr-vdr-vnsi/Config.in
similarity index 100%
rename from software/package/kodi-pvr-vdr-vnsi/Config.in
rename to buildroot/package/kodi-pvr-vdr-vnsi/Config.in
diff --git a/software/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
similarity index 100%
rename from software/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
rename to buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
diff --git a/software/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
similarity index 100%
rename from software/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
rename to buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
diff --git a/software/package/kodi-pvr-vuplus/Config.in b/buildroot/package/kodi-pvr-vuplus/Config.in
similarity index 100%
rename from software/package/kodi-pvr-vuplus/Config.in
rename to buildroot/package/kodi-pvr-vuplus/Config.in
diff --git a/software/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
similarity index 100%
rename from software/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
rename to buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
diff --git a/software/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
similarity index 100%
rename from software/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
rename to buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
diff --git a/software/package/kodi-pvr-wmc/Config.in b/buildroot/package/kodi-pvr-wmc/Config.in
similarity index 100%
rename from software/package/kodi-pvr-wmc/Config.in
rename to buildroot/package/kodi-pvr-wmc/Config.in
diff --git a/software/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
similarity index 100%
rename from software/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
rename to buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
diff --git a/software/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
similarity index 100%
rename from software/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
rename to buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
diff --git a/software/package/kodi-screensaver-asteroids/Config.in b/buildroot/package/kodi-screensaver-asteroids/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-asteroids/Config.in
rename to buildroot/package/kodi-screensaver-asteroids/Config.in
diff --git a/software/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
similarity index 100%
rename from software/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
rename to buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
diff --git a/software/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
similarity index 100%
rename from software/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
rename to buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
diff --git a/software/package/kodi-screensaver-asterwave/Config.in b/buildroot/package/kodi-screensaver-asterwave/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-asterwave/Config.in
rename to buildroot/package/kodi-screensaver-asterwave/Config.in
diff --git a/software/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
similarity index 100%
rename from software/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
rename to buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
diff --git a/software/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
similarity index 100%
rename from software/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
rename to buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
diff --git a/software/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
similarity index 100%
rename from software/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
rename to buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch
diff --git a/software/package/kodi-screensaver-biogenesis/Config.in b/buildroot/package/kodi-screensaver-biogenesis/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-biogenesis/Config.in
rename to buildroot/package/kodi-screensaver-biogenesis/Config.in
diff --git a/software/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
similarity index 100%
rename from software/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
rename to buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
diff --git a/software/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
similarity index 100%
rename from software/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
rename to buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
diff --git a/software/package/kodi-screensaver-cpblobs/Config.in b/buildroot/package/kodi-screensaver-cpblobs/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-cpblobs/Config.in
rename to buildroot/package/kodi-screensaver-cpblobs/Config.in
diff --git a/software/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
similarity index 100%
rename from software/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
rename to buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
diff --git a/software/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
similarity index 100%
rename from software/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
rename to buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
diff --git a/software/package/kodi-screensaver-crystalmorph/Config.in b/buildroot/package/kodi-screensaver-crystalmorph/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-crystalmorph/Config.in
rename to buildroot/package/kodi-screensaver-crystalmorph/Config.in
diff --git a/software/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
similarity index 100%
rename from software/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
rename to buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
diff --git a/software/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
similarity index 100%
rename from software/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
rename to buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
diff --git a/software/package/kodi-screensaver-greynetic/Config.in b/buildroot/package/kodi-screensaver-greynetic/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-greynetic/Config.in
rename to buildroot/package/kodi-screensaver-greynetic/Config.in
diff --git a/software/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
similarity index 100%
rename from software/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
rename to buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
diff --git a/software/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
similarity index 100%
rename from software/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
rename to buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
diff --git a/software/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
similarity index 100%
rename from software/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
rename to buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
diff --git a/software/package/kodi-screensaver-matrixtrails/Config.in b/buildroot/package/kodi-screensaver-matrixtrails/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-matrixtrails/Config.in
rename to buildroot/package/kodi-screensaver-matrixtrails/Config.in
diff --git a/software/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
similarity index 100%
rename from software/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
rename to buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
diff --git a/software/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
similarity index 100%
rename from software/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
rename to buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
diff --git a/software/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch b/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
similarity index 100%
rename from software/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
rename to buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch
diff --git a/software/package/kodi-screensaver-pingpong/Config.in b/buildroot/package/kodi-screensaver-pingpong/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-pingpong/Config.in
rename to buildroot/package/kodi-screensaver-pingpong/Config.in
diff --git a/software/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
similarity index 100%
rename from software/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
rename to buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
diff --git a/software/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
similarity index 100%
rename from software/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
rename to buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
diff --git a/software/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
similarity index 100%
rename from software/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
rename to buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch
diff --git a/software/package/kodi-screensaver-pyro/Config.in b/buildroot/package/kodi-screensaver-pyro/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-pyro/Config.in
rename to buildroot/package/kodi-screensaver-pyro/Config.in
diff --git a/software/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
similarity index 100%
rename from software/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
rename to buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
diff --git a/software/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
similarity index 100%
rename from software/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
rename to buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
diff --git a/software/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch b/buildroot/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
similarity index 100%
rename from software/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
rename to buildroot/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
diff --git a/software/package/kodi-screensaver-rsxs/Config.in b/buildroot/package/kodi-screensaver-rsxs/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-rsxs/Config.in
rename to buildroot/package/kodi-screensaver-rsxs/Config.in
diff --git a/software/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
similarity index 100%
rename from software/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
rename to buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
diff --git a/software/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
similarity index 100%
rename from software/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
rename to buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
diff --git a/software/package/kodi-screensaver-stars/Config.in b/buildroot/package/kodi-screensaver-stars/Config.in
similarity index 100%
rename from software/package/kodi-screensaver-stars/Config.in
rename to buildroot/package/kodi-screensaver-stars/Config.in
diff --git a/software/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
similarity index 100%
rename from software/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
rename to buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
diff --git a/software/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
similarity index 100%
rename from software/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
rename to buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
diff --git a/software/package/kodi-skin-confluence/Config.in b/buildroot/package/kodi-skin-confluence/Config.in
similarity index 100%
rename from software/package/kodi-skin-confluence/Config.in
rename to buildroot/package/kodi-skin-confluence/Config.in
diff --git a/software/package/kodi-skin-confluence/kodi-skin-confluence.hash b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash
similarity index 100%
rename from software/package/kodi-skin-confluence/kodi-skin-confluence.hash
rename to buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash
diff --git a/software/package/kodi-skin-confluence/kodi-skin-confluence.mk b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk
similarity index 100%
rename from software/package/kodi-skin-confluence/kodi-skin-confluence.mk
rename to buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk
diff --git a/software/package/kodi-texturepacker/0001-texturepacker.patch b/buildroot/package/kodi-texturepacker/0001-texturepacker.patch
similarity index 100%
rename from software/package/kodi-texturepacker/0001-texturepacker.patch
rename to buildroot/package/kodi-texturepacker/0001-texturepacker.patch
diff --git a/software/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch b/buildroot/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
similarity index 100%
rename from software/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
rename to buildroot/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch
diff --git a/software/package/kodi-texturepacker/kodi-texturepacker.hash b/buildroot/package/kodi-texturepacker/kodi-texturepacker.hash
similarity index 100%
rename from software/package/kodi-texturepacker/kodi-texturepacker.hash
rename to buildroot/package/kodi-texturepacker/kodi-texturepacker.hash
diff --git a/software/package/kodi-texturepacker/kodi-texturepacker.mk b/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk
similarity index 100%
rename from software/package/kodi-texturepacker/kodi-texturepacker.mk
rename to buildroot/package/kodi-texturepacker/kodi-texturepacker.mk
diff --git a/software/package/kodi-vfs-rar/Config.in b/buildroot/package/kodi-vfs-rar/Config.in
similarity index 100%
rename from software/package/kodi-vfs-rar/Config.in
rename to buildroot/package/kodi-vfs-rar/Config.in
diff --git a/software/package/kodi-vfs-rar/kodi-vfs-rar.hash b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash
similarity index 100%
rename from software/package/kodi-vfs-rar/kodi-vfs-rar.hash
rename to buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash
diff --git a/software/package/kodi-vfs-rar/kodi-vfs-rar.mk b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk
similarity index 100%
rename from software/package/kodi-vfs-rar/kodi-vfs-rar.mk
rename to buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk
diff --git a/software/package/kodi-vfs-sftp/Config.in b/buildroot/package/kodi-vfs-sftp/Config.in
similarity index 100%
rename from software/package/kodi-vfs-sftp/Config.in
rename to buildroot/package/kodi-vfs-sftp/Config.in
diff --git a/software/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash
similarity index 100%
rename from software/package/kodi-vfs-sftp/kodi-vfs-sftp.hash
rename to buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash
diff --git a/software/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk
similarity index 100%
rename from software/package/kodi-vfs-sftp/kodi-vfs-sftp.mk
rename to buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk
diff --git a/software/package/kodi-visualisation-fishbmc/Config.in b/buildroot/package/kodi-visualisation-fishbmc/Config.in
similarity index 100%
rename from software/package/kodi-visualisation-fishbmc/Config.in
rename to buildroot/package/kodi-visualisation-fishbmc/Config.in
diff --git a/software/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
similarity index 100%
rename from software/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
rename to buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
diff --git a/software/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
similarity index 100%
rename from software/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
rename to buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
diff --git a/software/package/kodi-visualisation-goom/Config.in b/buildroot/package/kodi-visualisation-goom/Config.in
similarity index 100%
rename from software/package/kodi-visualisation-goom/Config.in
rename to buildroot/package/kodi-visualisation-goom/Config.in
diff --git a/software/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
similarity index 100%
rename from software/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
rename to buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
diff --git a/software/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
similarity index 100%
rename from software/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
rename to buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
diff --git a/software/package/kodi-visualisation-shadertoy/Config.in b/buildroot/package/kodi-visualisation-shadertoy/Config.in
similarity index 100%
rename from software/package/kodi-visualisation-shadertoy/Config.in
rename to buildroot/package/kodi-visualisation-shadertoy/Config.in
diff --git a/software/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
similarity index 100%
rename from software/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
rename to buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
diff --git a/software/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
similarity index 100%
rename from software/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
rename to buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
diff --git a/software/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch b/buildroot/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
similarity index 100%
rename from software/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
rename to buildroot/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch
diff --git a/software/package/kodi-visualisation-spectrum/Config.in b/buildroot/package/kodi-visualisation-spectrum/Config.in
similarity index 100%
rename from software/package/kodi-visualisation-spectrum/Config.in
rename to buildroot/package/kodi-visualisation-spectrum/Config.in
diff --git a/software/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
similarity index 100%
rename from software/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
rename to buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
diff --git a/software/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
similarity index 100%
rename from software/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
rename to buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
diff --git a/software/package/kodi-visualisation-waveform/Config.in b/buildroot/package/kodi-visualisation-waveform/Config.in
similarity index 100%
rename from software/package/kodi-visualisation-waveform/Config.in
rename to buildroot/package/kodi-visualisation-waveform/Config.in
diff --git a/software/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
similarity index 100%
rename from software/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
rename to buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
diff --git a/software/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
similarity index 100%
rename from software/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
rename to buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
diff --git a/software/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
similarity index 100%
rename from software/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
rename to buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
diff --git a/software/package/kodi/0002-Fix-crosscompiling-issues.patch b/buildroot/package/kodi/0002-Fix-crosscompiling-issues.patch
similarity index 100%
rename from software/package/kodi/0002-Fix-crosscompiling-issues.patch
rename to buildroot/package/kodi/0002-Fix-crosscompiling-issues.patch
diff --git a/software/package/kodi/0003-Add-missing-cassert-includes.patch b/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch
similarity index 100%
rename from software/package/kodi/0003-Add-missing-cassert-includes.patch
rename to buildroot/package/kodi/0003-Add-missing-cassert-includes.patch
diff --git a/software/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch b/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch
similarity index 100%
rename from software/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch
rename to buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch
diff --git a/software/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch b/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
similarity index 100%
rename from software/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
rename to buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch
diff --git a/software/package/kodi/Config.in b/buildroot/package/kodi/Config.in
similarity index 100%
rename from software/package/kodi/Config.in
rename to buildroot/package/kodi/Config.in
diff --git a/software/package/kodi/S50kodi b/buildroot/package/kodi/S50kodi
similarity index 100%
rename from software/package/kodi/S50kodi
rename to buildroot/package/kodi/S50kodi
diff --git a/software/package/kodi/br-kodi b/buildroot/package/kodi/br-kodi
similarity index 100%
rename from software/package/kodi/br-kodi
rename to buildroot/package/kodi/br-kodi
diff --git a/software/package/kodi/kodi.hash b/buildroot/package/kodi/kodi.hash
similarity index 100%
rename from software/package/kodi/kodi.hash
rename to buildroot/package/kodi/kodi.hash
diff --git a/software/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk
similarity index 100%
rename from software/package/kodi/kodi.mk
rename to buildroot/package/kodi/kodi.mk
diff --git a/software/package/kodi/kodi.service b/buildroot/package/kodi/kodi.service
similarity index 100%
rename from software/package/kodi/kodi.service
rename to buildroot/package/kodi/kodi.service
diff --git a/software/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch b/buildroot/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch
similarity index 100%
rename from software/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch
rename to buildroot/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch
diff --git a/software/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch b/buildroot/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch
similarity index 100%
rename from software/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch
rename to buildroot/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch
diff --git a/software/package/kompexsqlite/Config.in b/buildroot/package/kompexsqlite/Config.in
similarity index 100%
rename from software/package/kompexsqlite/Config.in
rename to buildroot/package/kompexsqlite/Config.in
diff --git a/software/package/kompexsqlite/kompexsqlite.hash b/buildroot/package/kompexsqlite/kompexsqlite.hash
similarity index 100%
rename from software/package/kompexsqlite/kompexsqlite.hash
rename to buildroot/package/kompexsqlite/kompexsqlite.hash
diff --git a/software/package/kompexsqlite/kompexsqlite.mk b/buildroot/package/kompexsqlite/kompexsqlite.mk
similarity index 100%
rename from software/package/kompexsqlite/kompexsqlite.mk
rename to buildroot/package/kompexsqlite/kompexsqlite.mk
diff --git a/software/package/ktap/Config.in b/buildroot/package/ktap/Config.in
similarity index 100%
rename from software/package/ktap/Config.in
rename to buildroot/package/ktap/Config.in
diff --git a/software/package/ktap/ktap.hash b/buildroot/package/ktap/ktap.hash
similarity index 100%
rename from software/package/ktap/ktap.hash
rename to buildroot/package/ktap/ktap.hash
diff --git a/software/package/ktap/ktap.mk b/buildroot/package/ktap/ktap.mk
similarity index 100%
rename from software/package/ktap/ktap.mk
rename to buildroot/package/ktap/ktap.mk
diff --git a/software/package/kvazaar/Config.in b/buildroot/package/kvazaar/Config.in
similarity index 100%
rename from software/package/kvazaar/Config.in
rename to buildroot/package/kvazaar/Config.in
diff --git a/software/package/kvazaar/kvazaar.hash b/buildroot/package/kvazaar/kvazaar.hash
similarity index 100%
rename from software/package/kvazaar/kvazaar.hash
rename to buildroot/package/kvazaar/kvazaar.hash
diff --git a/software/package/kvazaar/kvazaar.mk b/buildroot/package/kvazaar/kvazaar.mk
similarity index 100%
rename from software/package/kvazaar/kvazaar.mk
rename to buildroot/package/kvazaar/kvazaar.mk
diff --git a/software/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/buildroot/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch
similarity index 100%
rename from software/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch
rename to buildroot/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch
diff --git a/software/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/buildroot/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch
similarity index 100%
rename from software/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch
rename to buildroot/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch
diff --git a/software/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/buildroot/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch
similarity index 100%
rename from software/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch
rename to buildroot/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch
diff --git a/software/package/kvm-unit-tests/Config.in b/buildroot/package/kvm-unit-tests/Config.in
similarity index 100%
rename from software/package/kvm-unit-tests/Config.in
rename to buildroot/package/kvm-unit-tests/Config.in
diff --git a/software/package/kvm-unit-tests/kvm-unit-tests.hash b/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash
similarity index 100%
rename from software/package/kvm-unit-tests/kvm-unit-tests.hash
rename to buildroot/package/kvm-unit-tests/kvm-unit-tests.hash
diff --git a/software/package/kvm-unit-tests/kvm-unit-tests.mk b/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk
similarity index 100%
rename from software/package/kvm-unit-tests/kvm-unit-tests.mk
rename to buildroot/package/kvm-unit-tests/kvm-unit-tests.mk
diff --git a/software/package/kvmtool/Config.in b/buildroot/package/kvmtool/Config.in
similarity index 100%
rename from software/package/kvmtool/Config.in
rename to buildroot/package/kvmtool/Config.in
diff --git a/software/package/kvmtool/kvmtool.hash b/buildroot/package/kvmtool/kvmtool.hash
similarity index 100%
rename from software/package/kvmtool/kvmtool.hash
rename to buildroot/package/kvmtool/kvmtool.hash
diff --git a/software/package/kvmtool/kvmtool.mk b/buildroot/package/kvmtool/kvmtool.mk
similarity index 100%
rename from software/package/kvmtool/kvmtool.mk
rename to buildroot/package/kvmtool/kvmtool.mk
diff --git a/software/package/kyua/Config.in b/buildroot/package/kyua/Config.in
similarity index 100%
rename from software/package/kyua/Config.in
rename to buildroot/package/kyua/Config.in
diff --git a/software/package/kyua/kyua.hash b/buildroot/package/kyua/kyua.hash
similarity index 100%
rename from software/package/kyua/kyua.hash
rename to buildroot/package/kyua/kyua.hash
diff --git a/software/package/kyua/kyua.mk b/buildroot/package/kyua/kyua.mk
similarity index 100%
rename from software/package/kyua/kyua.mk
rename to buildroot/package/kyua/kyua.mk
diff --git a/software/package/lame/Config.in b/buildroot/package/lame/Config.in
similarity index 100%
rename from software/package/lame/Config.in
rename to buildroot/package/lame/Config.in
diff --git a/software/package/lame/lame.hash b/buildroot/package/lame/lame.hash
similarity index 100%
rename from software/package/lame/lame.hash
rename to buildroot/package/lame/lame.hash
diff --git a/software/package/lame/lame.mk b/buildroot/package/lame/lame.mk
similarity index 100%
rename from software/package/lame/lame.mk
rename to buildroot/package/lame/lame.mk
diff --git a/software/package/lapack/Config.in b/buildroot/package/lapack/Config.in
similarity index 100%
rename from software/package/lapack/Config.in
rename to buildroot/package/lapack/Config.in
diff --git a/software/package/lapack/lapack.hash b/buildroot/package/lapack/lapack.hash
similarity index 100%
rename from software/package/lapack/lapack.hash
rename to buildroot/package/lapack/lapack.hash
diff --git a/software/package/lapack/lapack.mk b/buildroot/package/lapack/lapack.mk
similarity index 100%
rename from software/package/lapack/lapack.mk
rename to buildroot/package/lapack/lapack.mk
diff --git a/software/package/latencytop/0001-makefile.patch b/buildroot/package/latencytop/0001-makefile.patch
similarity index 100%
rename from software/package/latencytop/0001-makefile.patch
rename to buildroot/package/latencytop/0001-makefile.patch
diff --git a/software/package/latencytop/Config.in b/buildroot/package/latencytop/Config.in
similarity index 100%
rename from software/package/latencytop/Config.in
rename to buildroot/package/latencytop/Config.in
diff --git a/software/package/latencytop/latencytop.hash b/buildroot/package/latencytop/latencytop.hash
similarity index 100%
rename from software/package/latencytop/latencytop.hash
rename to buildroot/package/latencytop/latencytop.hash
diff --git a/software/package/latencytop/latencytop.mk b/buildroot/package/latencytop/latencytop.mk
similarity index 100%
rename from software/package/latencytop/latencytop.mk
rename to buildroot/package/latencytop/latencytop.mk
diff --git a/software/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch b/buildroot/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
similarity index 100%
rename from software/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
rename to buildroot/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
diff --git a/software/package/lbase64/Config.in b/buildroot/package/lbase64/Config.in
similarity index 100%
rename from software/package/lbase64/Config.in
rename to buildroot/package/lbase64/Config.in
diff --git a/software/package/lbase64/lbase64.hash b/buildroot/package/lbase64/lbase64.hash
similarity index 100%
rename from software/package/lbase64/lbase64.hash
rename to buildroot/package/lbase64/lbase64.hash
diff --git a/software/package/lbase64/lbase64.mk b/buildroot/package/lbase64/lbase64.mk
similarity index 100%
rename from software/package/lbase64/lbase64.mk
rename to buildroot/package/lbase64/lbase64.mk
diff --git a/software/package/lbreakout2/Config.in b/buildroot/package/lbreakout2/Config.in
similarity index 100%
rename from software/package/lbreakout2/Config.in
rename to buildroot/package/lbreakout2/Config.in
diff --git a/software/package/lbreakout2/lbreakout2.hash b/buildroot/package/lbreakout2/lbreakout2.hash
similarity index 100%
rename from software/package/lbreakout2/lbreakout2.hash
rename to buildroot/package/lbreakout2/lbreakout2.hash
diff --git a/software/package/lbreakout2/lbreakout2.mk b/buildroot/package/lbreakout2/lbreakout2.mk
similarity index 100%
rename from software/package/lbreakout2/lbreakout2.mk
rename to buildroot/package/lbreakout2/lbreakout2.mk
diff --git a/software/package/lcdapi/Config.in b/buildroot/package/lcdapi/Config.in
similarity index 100%
rename from software/package/lcdapi/Config.in
rename to buildroot/package/lcdapi/Config.in
diff --git a/software/package/lcdapi/lcdapi.hash b/buildroot/package/lcdapi/lcdapi.hash
similarity index 100%
rename from software/package/lcdapi/lcdapi.hash
rename to buildroot/package/lcdapi/lcdapi.hash
diff --git a/software/package/lcdapi/lcdapi.mk b/buildroot/package/lcdapi/lcdapi.mk
similarity index 100%
rename from software/package/lcdapi/lcdapi.mk
rename to buildroot/package/lcdapi/lcdapi.mk
diff --git a/software/package/lcdproc/0001-Add-missing-ioctl-header.patch b/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch
similarity index 100%
rename from software/package/lcdproc/0001-Add-missing-ioctl-header.patch
rename to buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch
diff --git a/software/package/lcdproc/0001-LCDd.conf.patch b/buildroot/package/lcdproc/0001-LCDd.conf.patch
similarity index 100%
rename from software/package/lcdproc/0001-LCDd.conf.patch
rename to buildroot/package/lcdproc/0001-LCDd.conf.patch
diff --git a/software/package/lcdproc/Config.in b/buildroot/package/lcdproc/Config.in
similarity index 100%
rename from software/package/lcdproc/Config.in
rename to buildroot/package/lcdproc/Config.in
diff --git a/software/package/lcdproc/lcdproc.hash b/buildroot/package/lcdproc/lcdproc.hash
similarity index 100%
rename from software/package/lcdproc/lcdproc.hash
rename to buildroot/package/lcdproc/lcdproc.hash
diff --git a/software/package/lcdproc/lcdproc.mk b/buildroot/package/lcdproc/lcdproc.mk
similarity index 100%
rename from software/package/lcdproc/lcdproc.mk
rename to buildroot/package/lcdproc/lcdproc.mk
diff --git a/software/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch b/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch
similarity index 100%
rename from software/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch
rename to buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch
diff --git a/software/package/lcms2/Config.in b/buildroot/package/lcms2/Config.in
similarity index 100%
rename from software/package/lcms2/Config.in
rename to buildroot/package/lcms2/Config.in
diff --git a/software/package/lcms2/lcms2.hash b/buildroot/package/lcms2/lcms2.hash
similarity index 100%
rename from software/package/lcms2/lcms2.hash
rename to buildroot/package/lcms2/lcms2.hash
diff --git a/software/package/lcms2/lcms2.mk b/buildroot/package/lcms2/lcms2.mk
similarity index 100%
rename from software/package/lcms2/lcms2.mk
rename to buildroot/package/lcms2/lcms2.mk
diff --git a/software/package/leafnode2/0001-cross_makefile.patch b/buildroot/package/leafnode2/0001-cross_makefile.patch
similarity index 100%
rename from software/package/leafnode2/0001-cross_makefile.patch
rename to buildroot/package/leafnode2/0001-cross_makefile.patch
diff --git a/software/package/leafnode2/Config.in b/buildroot/package/leafnode2/Config.in
similarity index 100%
rename from software/package/leafnode2/Config.in
rename to buildroot/package/leafnode2/Config.in
diff --git a/software/package/leafnode2/leafnode2.hash b/buildroot/package/leafnode2/leafnode2.hash
similarity index 100%
rename from software/package/leafnode2/leafnode2.hash
rename to buildroot/package/leafnode2/leafnode2.hash
diff --git a/software/package/leafnode2/leafnode2.mk b/buildroot/package/leafnode2/leafnode2.mk
similarity index 100%
rename from software/package/leafnode2/leafnode2.mk
rename to buildroot/package/leafnode2/leafnode2.mk
diff --git a/software/package/leafpad/Config.in b/buildroot/package/leafpad/Config.in
similarity index 100%
rename from software/package/leafpad/Config.in
rename to buildroot/package/leafpad/Config.in
diff --git a/software/package/leafpad/leafpad.hash b/buildroot/package/leafpad/leafpad.hash
similarity index 100%
rename from software/package/leafpad/leafpad.hash
rename to buildroot/package/leafpad/leafpad.hash
diff --git a/software/package/leafpad/leafpad.mk b/buildroot/package/leafpad/leafpad.mk
similarity index 100%
rename from software/package/leafpad/leafpad.mk
rename to buildroot/package/leafpad/leafpad.mk
diff --git a/software/package/lensfun/Config.in b/buildroot/package/lensfun/Config.in
similarity index 100%
rename from software/package/lensfun/Config.in
rename to buildroot/package/lensfun/Config.in
diff --git a/software/package/lensfun/lensfun.hash b/buildroot/package/lensfun/lensfun.hash
similarity index 100%
rename from software/package/lensfun/lensfun.hash
rename to buildroot/package/lensfun/lensfun.hash
diff --git a/software/package/lensfun/lensfun.mk b/buildroot/package/lensfun/lensfun.mk
similarity index 100%
rename from software/package/lensfun/lensfun.mk
rename to buildroot/package/lensfun/lensfun.mk
diff --git a/software/package/leptonica/Config.in b/buildroot/package/leptonica/Config.in
similarity index 100%
rename from software/package/leptonica/Config.in
rename to buildroot/package/leptonica/Config.in
diff --git a/software/package/leptonica/leptonica.hash b/buildroot/package/leptonica/leptonica.hash
similarity index 100%
rename from software/package/leptonica/leptonica.hash
rename to buildroot/package/leptonica/leptonica.hash
diff --git a/software/package/leptonica/leptonica.mk b/buildroot/package/leptonica/leptonica.mk
similarity index 100%
rename from software/package/leptonica/leptonica.mk
rename to buildroot/package/leptonica/leptonica.mk
diff --git a/software/package/less/Config.in b/buildroot/package/less/Config.in
similarity index 100%
rename from software/package/less/Config.in
rename to buildroot/package/less/Config.in
diff --git a/software/package/less/less.hash b/buildroot/package/less/less.hash
similarity index 100%
rename from software/package/less/less.hash
rename to buildroot/package/less/less.hash
diff --git a/software/package/less/less.mk b/buildroot/package/less/less.mk
similarity index 100%
rename from software/package/less/less.mk
rename to buildroot/package/less/less.mk
diff --git a/software/package/lesstif/Config.in b/buildroot/package/lesstif/Config.in
similarity index 100%
rename from software/package/lesstif/Config.in
rename to buildroot/package/lesstif/Config.in
diff --git a/software/package/lesstif/lesstif.hash b/buildroot/package/lesstif/lesstif.hash
similarity index 100%
rename from software/package/lesstif/lesstif.hash
rename to buildroot/package/lesstif/lesstif.hash
diff --git a/software/package/lesstif/lesstif.mk b/buildroot/package/lesstif/lesstif.mk
similarity index 100%
rename from software/package/lesstif/lesstif.mk
rename to buildroot/package/lesstif/lesstif.mk
diff --git a/software/package/let-me-create/0001-fix-build-with-musl-C-library.patch b/buildroot/package/let-me-create/0001-fix-build-with-musl-C-library.patch
similarity index 100%
rename from software/package/let-me-create/0001-fix-build-with-musl-C-library.patch
rename to buildroot/package/let-me-create/0001-fix-build-with-musl-C-library.patch
diff --git a/software/package/let-me-create/Config.in b/buildroot/package/let-me-create/Config.in
similarity index 100%
rename from software/package/let-me-create/Config.in
rename to buildroot/package/let-me-create/Config.in
diff --git a/software/package/let-me-create/let-me-create.hash b/buildroot/package/let-me-create/let-me-create.hash
similarity index 100%
rename from software/package/let-me-create/let-me-create.hash
rename to buildroot/package/let-me-create/let-me-create.hash
diff --git a/software/package/let-me-create/let-me-create.mk b/buildroot/package/let-me-create/let-me-create.mk
similarity index 100%
rename from software/package/let-me-create/let-me-create.mk
rename to buildroot/package/let-me-create/let-me-create.mk
diff --git a/software/package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch b/buildroot/package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch
similarity index 100%
rename from software/package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch
rename to buildroot/package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch
diff --git a/software/package/leveldb/0002-CMake-install-libmemenv.a.patch b/buildroot/package/leveldb/0002-CMake-install-libmemenv.a.patch
similarity index 100%
rename from software/package/leveldb/0002-CMake-install-libmemenv.a.patch
rename to buildroot/package/leveldb/0002-CMake-install-libmemenv.a.patch
diff --git a/software/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch b/buildroot/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch
similarity index 100%
rename from software/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch
rename to buildroot/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch
diff --git a/software/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch b/buildroot/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch
similarity index 100%
rename from software/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch
rename to buildroot/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch
diff --git a/software/package/leveldb/Config.in b/buildroot/package/leveldb/Config.in
similarity index 100%
rename from software/package/leveldb/Config.in
rename to buildroot/package/leveldb/Config.in
diff --git a/software/package/leveldb/leveldb.hash b/buildroot/package/leveldb/leveldb.hash
similarity index 100%
rename from software/package/leveldb/leveldb.hash
rename to buildroot/package/leveldb/leveldb.hash
diff --git a/software/package/leveldb/leveldb.mk b/buildroot/package/leveldb/leveldb.mk
similarity index 100%
rename from software/package/leveldb/leveldb.mk
rename to buildroot/package/leveldb/leveldb.mk
diff --git a/software/package/lft/Config.in b/buildroot/package/lft/Config.in
similarity index 100%
rename from software/package/lft/Config.in
rename to buildroot/package/lft/Config.in
diff --git a/software/package/lft/lft.hash b/buildroot/package/lft/lft.hash
similarity index 100%
rename from software/package/lft/lft.hash
rename to buildroot/package/lft/lft.hash
diff --git a/software/package/lft/lft.mk b/buildroot/package/lft/lft.mk
similarity index 100%
rename from software/package/lft/lft.mk
rename to buildroot/package/lft/lft.mk
diff --git a/software/package/lftp/Config.in b/buildroot/package/lftp/Config.in
similarity index 100%
rename from software/package/lftp/Config.in
rename to buildroot/package/lftp/Config.in
diff --git a/software/package/lftp/lftp.hash b/buildroot/package/lftp/lftp.hash
similarity index 100%
rename from software/package/lftp/lftp.hash
rename to buildroot/package/lftp/lftp.hash
diff --git a/software/package/lftp/lftp.mk b/buildroot/package/lftp/lftp.mk
similarity index 100%
rename from software/package/lftp/lftp.mk
rename to buildroot/package/lftp/lftp.mk
diff --git a/software/package/libaacs/Config.in b/buildroot/package/libaacs/Config.in
similarity index 100%
rename from software/package/libaacs/Config.in
rename to buildroot/package/libaacs/Config.in
diff --git a/software/package/libaacs/libaacs.hash b/buildroot/package/libaacs/libaacs.hash
similarity index 100%
rename from software/package/libaacs/libaacs.hash
rename to buildroot/package/libaacs/libaacs.hash
diff --git a/software/package/libaacs/libaacs.mk b/buildroot/package/libaacs/libaacs.mk
similarity index 100%
rename from software/package/libaacs/libaacs.mk
rename to buildroot/package/libaacs/libaacs.mk
diff --git a/software/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch b/buildroot/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch
similarity index 100%
rename from software/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch
rename to buildroot/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch
diff --git a/software/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch b/buildroot/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch
similarity index 100%
rename from software/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch
rename to buildroot/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch
diff --git a/software/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch b/buildroot/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch
similarity index 100%
rename from software/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch
rename to buildroot/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch
diff --git a/software/package/libaio/Config.in b/buildroot/package/libaio/Config.in
similarity index 100%
rename from software/package/libaio/Config.in
rename to buildroot/package/libaio/Config.in
diff --git a/software/package/libaio/libaio.hash b/buildroot/package/libaio/libaio.hash
similarity index 100%
rename from software/package/libaio/libaio.hash
rename to buildroot/package/libaio/libaio.hash
diff --git a/software/package/libaio/libaio.mk b/buildroot/package/libaio/libaio.mk
similarity index 100%
rename from software/package/libaio/libaio.mk
rename to buildroot/package/libaio/libaio.mk
diff --git a/software/package/libao/Config.in b/buildroot/package/libao/Config.in
similarity index 100%
rename from software/package/libao/Config.in
rename to buildroot/package/libao/Config.in
diff --git a/software/package/libao/libao.hash b/buildroot/package/libao/libao.hash
similarity index 100%
rename from software/package/libao/libao.hash
rename to buildroot/package/libao/libao.hash
diff --git a/software/package/libao/libao.mk b/buildroot/package/libao/libao.mk
similarity index 100%
rename from software/package/libao/libao.mk
rename to buildroot/package/libao/libao.mk
diff --git a/software/package/libarchive/Config.in b/buildroot/package/libarchive/Config.in
similarity index 100%
rename from software/package/libarchive/Config.in
rename to buildroot/package/libarchive/Config.in
diff --git a/software/package/libarchive/libarchive.hash b/buildroot/package/libarchive/libarchive.hash
similarity index 100%
rename from software/package/libarchive/libarchive.hash
rename to buildroot/package/libarchive/libarchive.hash
diff --git a/software/package/libarchive/libarchive.mk b/buildroot/package/libarchive/libarchive.mk
similarity index 100%
rename from software/package/libarchive/libarchive.mk
rename to buildroot/package/libarchive/libarchive.mk
diff --git a/software/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch b/buildroot/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch
similarity index 100%
rename from software/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch
rename to buildroot/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch
diff --git a/software/package/libargon2/Config.in b/buildroot/package/libargon2/Config.in
similarity index 100%
rename from software/package/libargon2/Config.in
rename to buildroot/package/libargon2/Config.in
diff --git a/software/package/libargon2/libargon2.hash b/buildroot/package/libargon2/libargon2.hash
similarity index 100%
rename from software/package/libargon2/libargon2.hash
rename to buildroot/package/libargon2/libargon2.hash
diff --git a/software/package/libargon2/libargon2.mk b/buildroot/package/libargon2/libargon2.mk
similarity index 100%
rename from software/package/libargon2/libargon2.mk
rename to buildroot/package/libargon2/libargon2.mk
diff --git a/software/package/libargtable2/Config.in b/buildroot/package/libargtable2/Config.in
similarity index 100%
rename from software/package/libargtable2/Config.in
rename to buildroot/package/libargtable2/Config.in
diff --git a/software/package/libargtable2/libargtable2.hash b/buildroot/package/libargtable2/libargtable2.hash
similarity index 100%
rename from software/package/libargtable2/libargtable2.hash
rename to buildroot/package/libargtable2/libargtable2.hash
diff --git a/software/package/libargtable2/libargtable2.mk b/buildroot/package/libargtable2/libargtable2.mk
similarity index 100%
rename from software/package/libargtable2/libargtable2.mk
rename to buildroot/package/libargtable2/libargtable2.mk
diff --git a/software/package/libart/0001-art-config-cross.patch b/buildroot/package/libart/0001-art-config-cross.patch
similarity index 100%
rename from software/package/libart/0001-art-config-cross.patch
rename to buildroot/package/libart/0001-art-config-cross.patch
diff --git a/software/package/libart/Config.in b/buildroot/package/libart/Config.in
similarity index 100%
rename from software/package/libart/Config.in
rename to buildroot/package/libart/Config.in
diff --git a/software/package/libart/libart.hash b/buildroot/package/libart/libart.hash
similarity index 100%
rename from software/package/libart/libart.hash
rename to buildroot/package/libart/libart.hash
diff --git a/software/package/libart/libart.mk b/buildroot/package/libart/libart.mk
similarity index 100%
rename from software/package/libart/libart.mk
rename to buildroot/package/libart/libart.mk
diff --git a/software/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch b/buildroot/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch
similarity index 100%
rename from software/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch
rename to buildroot/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch
diff --git a/software/package/libasplib/Config.in b/buildroot/package/libasplib/Config.in
similarity index 100%
rename from software/package/libasplib/Config.in
rename to buildroot/package/libasplib/Config.in
diff --git a/software/package/libasplib/libasplib.hash b/buildroot/package/libasplib/libasplib.hash
similarity index 100%
rename from software/package/libasplib/libasplib.hash
rename to buildroot/package/libasplib/libasplib.hash
diff --git a/software/package/libasplib/libasplib.mk b/buildroot/package/libasplib/libasplib.mk
similarity index 100%
rename from software/package/libasplib/libasplib.mk
rename to buildroot/package/libasplib/libasplib.mk
diff --git a/software/package/libass/Config.in b/buildroot/package/libass/Config.in
similarity index 100%
rename from software/package/libass/Config.in
rename to buildroot/package/libass/Config.in
diff --git a/software/package/libass/libass.hash b/buildroot/package/libass/libass.hash
similarity index 100%
rename from software/package/libass/libass.hash
rename to buildroot/package/libass/libass.hash
diff --git a/software/package/libass/libass.mk b/buildroot/package/libass/libass.mk
similarity index 100%
rename from software/package/libass/libass.mk
rename to buildroot/package/libass/libass.mk
diff --git a/software/package/libassuan/Config.in b/buildroot/package/libassuan/Config.in
similarity index 100%
rename from software/package/libassuan/Config.in
rename to buildroot/package/libassuan/Config.in
diff --git a/software/package/libassuan/libassuan.hash b/buildroot/package/libassuan/libassuan.hash
similarity index 100%
rename from software/package/libassuan/libassuan.hash
rename to buildroot/package/libassuan/libassuan.hash
diff --git a/software/package/libassuan/libassuan.mk b/buildroot/package/libassuan/libassuan.mk
similarity index 100%
rename from software/package/libassuan/libassuan.mk
rename to buildroot/package/libassuan/libassuan.mk
diff --git a/software/package/libatasmart/0001-strpool-cross-flags.patch b/buildroot/package/libatasmart/0001-strpool-cross-flags.patch
similarity index 100%
rename from software/package/libatasmart/0001-strpool-cross-flags.patch
rename to buildroot/package/libatasmart/0001-strpool-cross-flags.patch
diff --git a/software/package/libatasmart/Config.in b/buildroot/package/libatasmart/Config.in
similarity index 100%
rename from software/package/libatasmart/Config.in
rename to buildroot/package/libatasmart/Config.in
diff --git a/software/package/libatasmart/libatasmart.hash b/buildroot/package/libatasmart/libatasmart.hash
similarity index 100%
rename from software/package/libatasmart/libatasmart.hash
rename to buildroot/package/libatasmart/libatasmart.hash
diff --git a/software/package/libatasmart/libatasmart.mk b/buildroot/package/libatasmart/libatasmart.mk
similarity index 100%
rename from software/package/libatasmart/libatasmart.mk
rename to buildroot/package/libatasmart/libatasmart.mk
diff --git a/software/package/libatomic_ops/Config.in b/buildroot/package/libatomic_ops/Config.in
similarity index 100%
rename from software/package/libatomic_ops/Config.in
rename to buildroot/package/libatomic_ops/Config.in
diff --git a/software/package/libatomic_ops/libatomic_ops.hash b/buildroot/package/libatomic_ops/libatomic_ops.hash
similarity index 100%
rename from software/package/libatomic_ops/libatomic_ops.hash
rename to buildroot/package/libatomic_ops/libatomic_ops.hash
diff --git a/software/package/libatomic_ops/libatomic_ops.mk b/buildroot/package/libatomic_ops/libatomic_ops.mk
similarity index 100%
rename from software/package/libatomic_ops/libatomic_ops.mk
rename to buildroot/package/libatomic_ops/libatomic_ops.mk
diff --git a/software/package/libavl/0001-fix-makefile.patch b/buildroot/package/libavl/0001-fix-makefile.patch
similarity index 100%
rename from software/package/libavl/0001-fix-makefile.patch
rename to buildroot/package/libavl/0001-fix-makefile.patch
diff --git a/software/package/libavl/Config.in b/buildroot/package/libavl/Config.in
similarity index 100%
rename from software/package/libavl/Config.in
rename to buildroot/package/libavl/Config.in
diff --git a/software/package/libavl/libavl.hash b/buildroot/package/libavl/libavl.hash
similarity index 100%
rename from software/package/libavl/libavl.hash
rename to buildroot/package/libavl/libavl.hash
diff --git a/software/package/libavl/libavl.mk b/buildroot/package/libavl/libavl.mk
similarity index 100%
rename from software/package/libavl/libavl.mk
rename to buildroot/package/libavl/libavl.mk
diff --git a/software/package/libb64/0001-Integer-overflows.patch b/buildroot/package/libb64/0001-Integer-overflows.patch
similarity index 100%
rename from software/package/libb64/0001-Integer-overflows.patch
rename to buildroot/package/libb64/0001-Integer-overflows.patch
diff --git a/software/package/libb64/0002-Initialize-C++-objects.patch b/buildroot/package/libb64/0002-Initialize-C++-objects.patch
similarity index 100%
rename from software/package/libb64/0002-Initialize-C++-objects.patch
rename to buildroot/package/libb64/0002-Initialize-C++-objects.patch
diff --git a/software/package/libb64/Config.in b/buildroot/package/libb64/Config.in
similarity index 100%
rename from software/package/libb64/Config.in
rename to buildroot/package/libb64/Config.in
diff --git a/software/package/libb64/libb64.hash b/buildroot/package/libb64/libb64.hash
similarity index 100%
rename from software/package/libb64/libb64.hash
rename to buildroot/package/libb64/libb64.hash
diff --git a/software/package/libb64/libb64.mk b/buildroot/package/libb64/libb64.mk
similarity index 100%
rename from software/package/libb64/libb64.mk
rename to buildroot/package/libb64/libb64.mk
diff --git a/software/package/libbdplus/Config.in b/buildroot/package/libbdplus/Config.in
similarity index 100%
rename from software/package/libbdplus/Config.in
rename to buildroot/package/libbdplus/Config.in
diff --git a/software/package/libbdplus/libbdplus.hash b/buildroot/package/libbdplus/libbdplus.hash
similarity index 100%
rename from software/package/libbdplus/libbdplus.hash
rename to buildroot/package/libbdplus/libbdplus.hash
diff --git a/software/package/libbdplus/libbdplus.mk b/buildroot/package/libbdplus/libbdplus.mk
similarity index 100%
rename from software/package/libbdplus/libbdplus.mk
rename to buildroot/package/libbdplus/libbdplus.mk
diff --git a/software/package/libbluray/Config.in b/buildroot/package/libbluray/Config.in
similarity index 100%
rename from software/package/libbluray/Config.in
rename to buildroot/package/libbluray/Config.in
diff --git a/software/package/libbluray/libbluray.hash b/buildroot/package/libbluray/libbluray.hash
similarity index 100%
rename from software/package/libbluray/libbluray.hash
rename to buildroot/package/libbluray/libbluray.hash
diff --git a/software/package/libbluray/libbluray.mk b/buildroot/package/libbluray/libbluray.mk
similarity index 100%
rename from software/package/libbluray/libbluray.mk
rename to buildroot/package/libbluray/libbluray.mk
diff --git a/software/package/libbroadvoice/Config.in b/buildroot/package/libbroadvoice/Config.in
similarity index 100%
rename from software/package/libbroadvoice/Config.in
rename to buildroot/package/libbroadvoice/Config.in
diff --git a/software/package/libbroadvoice/libbroadvoice.hash b/buildroot/package/libbroadvoice/libbroadvoice.hash
similarity index 100%
rename from software/package/libbroadvoice/libbroadvoice.hash
rename to buildroot/package/libbroadvoice/libbroadvoice.hash
diff --git a/software/package/libbroadvoice/libbroadvoice.mk b/buildroot/package/libbroadvoice/libbroadvoice.mk
similarity index 100%
rename from software/package/libbroadvoice/libbroadvoice.mk
rename to buildroot/package/libbroadvoice/libbroadvoice.mk
diff --git a/software/package/libbsd/Config.in b/buildroot/package/libbsd/Config.in
similarity index 100%
rename from software/package/libbsd/Config.in
rename to buildroot/package/libbsd/Config.in
diff --git a/software/package/libbsd/libbsd.hash b/buildroot/package/libbsd/libbsd.hash
similarity index 100%
rename from software/package/libbsd/libbsd.hash
rename to buildroot/package/libbsd/libbsd.hash
diff --git a/software/package/libbsd/libbsd.mk b/buildroot/package/libbsd/libbsd.mk
similarity index 100%
rename from software/package/libbsd/libbsd.mk
rename to buildroot/package/libbsd/libbsd.mk
diff --git a/software/package/libbson/Config.in b/buildroot/package/libbson/Config.in
similarity index 100%
rename from software/package/libbson/Config.in
rename to buildroot/package/libbson/Config.in
diff --git a/software/package/libbson/libbson.hash b/buildroot/package/libbson/libbson.hash
similarity index 100%
rename from software/package/libbson/libbson.hash
rename to buildroot/package/libbson/libbson.hash
diff --git a/software/package/libbson/libbson.mk b/buildroot/package/libbson/libbson.mk
similarity index 100%
rename from software/package/libbson/libbson.mk
rename to buildroot/package/libbson/libbson.mk
diff --git a/software/package/libcamera/Config.in b/buildroot/package/libcamera/Config.in
similarity index 100%
rename from software/package/libcamera/Config.in
rename to buildroot/package/libcamera/Config.in
diff --git a/software/package/libcamera/libcamera.hash b/buildroot/package/libcamera/libcamera.hash
similarity index 100%
rename from software/package/libcamera/libcamera.hash
rename to buildroot/package/libcamera/libcamera.hash
diff --git a/software/package/libcamera/libcamera.mk b/buildroot/package/libcamera/libcamera.mk
similarity index 100%
rename from software/package/libcamera/libcamera.mk
rename to buildroot/package/libcamera/libcamera.mk
diff --git a/software/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch b/buildroot/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch
similarity index 100%
rename from software/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch
rename to buildroot/package/libcap-ng/0001-Fix-compilation-without-pthread.h.patch
diff --git a/software/package/libcap-ng/Config.in b/buildroot/package/libcap-ng/Config.in
similarity index 100%
rename from software/package/libcap-ng/Config.in
rename to buildroot/package/libcap-ng/Config.in
diff --git a/software/package/libcap-ng/libcap-ng.hash b/buildroot/package/libcap-ng/libcap-ng.hash
similarity index 100%
rename from software/package/libcap-ng/libcap-ng.hash
rename to buildroot/package/libcap-ng/libcap-ng.hash
diff --git a/software/package/libcap-ng/libcap-ng.mk b/buildroot/package/libcap-ng/libcap-ng.mk
similarity index 100%
rename from software/package/libcap-ng/libcap-ng.mk
rename to buildroot/package/libcap-ng/libcap-ng.mk
diff --git a/software/package/libcap/0001-build-system-fixes-for-cross-compilation.patch b/buildroot/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
similarity index 100%
rename from software/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
rename to buildroot/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
diff --git a/software/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch b/buildroot/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
similarity index 100%
rename from software/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
rename to buildroot/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
diff --git a/software/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch b/buildroot/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch
similarity index 100%
rename from software/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch
rename to buildroot/package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch
diff --git a/software/package/libcap/Config.in b/buildroot/package/libcap/Config.in
similarity index 100%
rename from software/package/libcap/Config.in
rename to buildroot/package/libcap/Config.in
diff --git a/software/package/libcap/libcap.hash b/buildroot/package/libcap/libcap.hash
similarity index 100%
rename from software/package/libcap/libcap.hash
rename to buildroot/package/libcap/libcap.hash
diff --git a/software/package/libcap/libcap.mk b/buildroot/package/libcap/libcap.mk
similarity index 100%
rename from software/package/libcap/libcap.mk
rename to buildroot/package/libcap/libcap.mk
diff --git a/software/package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch b/buildroot/package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch
similarity index 100%
rename from software/package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch
rename to buildroot/package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch
diff --git a/software/package/libcdaudio/Config.in b/buildroot/package/libcdaudio/Config.in
similarity index 100%
rename from software/package/libcdaudio/Config.in
rename to buildroot/package/libcdaudio/Config.in
diff --git a/software/package/libcdaudio/libcdaudio.hash b/buildroot/package/libcdaudio/libcdaudio.hash
similarity index 100%
rename from software/package/libcdaudio/libcdaudio.hash
rename to buildroot/package/libcdaudio/libcdaudio.hash
diff --git a/software/package/libcdaudio/libcdaudio.mk b/buildroot/package/libcdaudio/libcdaudio.mk
similarity index 100%
rename from software/package/libcdaudio/libcdaudio.mk
rename to buildroot/package/libcdaudio/libcdaudio.mk
diff --git a/software/package/libcddb/Config.in b/buildroot/package/libcddb/Config.in
similarity index 100%
rename from software/package/libcddb/Config.in
rename to buildroot/package/libcddb/Config.in
diff --git a/software/package/libcddb/libcddb.hash b/buildroot/package/libcddb/libcddb.hash
similarity index 100%
rename from software/package/libcddb/libcddb.hash
rename to buildroot/package/libcddb/libcddb.hash
diff --git a/software/package/libcddb/libcddb.mk b/buildroot/package/libcddb/libcddb.mk
similarity index 100%
rename from software/package/libcddb/libcddb.mk
rename to buildroot/package/libcddb/libcddb.mk
diff --git a/software/package/libcdio-paranoia/Config.in b/buildroot/package/libcdio-paranoia/Config.in
similarity index 100%
rename from software/package/libcdio-paranoia/Config.in
rename to buildroot/package/libcdio-paranoia/Config.in
diff --git a/software/package/libcdio-paranoia/libcdio-paranoia.hash b/buildroot/package/libcdio-paranoia/libcdio-paranoia.hash
similarity index 100%
rename from software/package/libcdio-paranoia/libcdio-paranoia.hash
rename to buildroot/package/libcdio-paranoia/libcdio-paranoia.hash
diff --git a/software/package/libcdio-paranoia/libcdio-paranoia.mk b/buildroot/package/libcdio-paranoia/libcdio-paranoia.mk
similarity index 100%
rename from software/package/libcdio-paranoia/libcdio-paranoia.mk
rename to buildroot/package/libcdio-paranoia/libcdio-paranoia.mk
diff --git a/software/package/libcdio/Config.in b/buildroot/package/libcdio/Config.in
similarity index 100%
rename from software/package/libcdio/Config.in
rename to buildroot/package/libcdio/Config.in
diff --git a/software/package/libcdio/libcdio.hash b/buildroot/package/libcdio/libcdio.hash
similarity index 100%
rename from software/package/libcdio/libcdio.hash
rename to buildroot/package/libcdio/libcdio.hash
diff --git a/software/package/libcdio/libcdio.mk b/buildroot/package/libcdio/libcdio.mk
similarity index 100%
rename from software/package/libcdio/libcdio.mk
rename to buildroot/package/libcdio/libcdio.mk
diff --git a/software/package/libcec/Config.in b/buildroot/package/libcec/Config.in
similarity index 100%
rename from software/package/libcec/Config.in
rename to buildroot/package/libcec/Config.in
diff --git a/software/package/libcec/libcec.hash b/buildroot/package/libcec/libcec.hash
similarity index 100%
rename from software/package/libcec/libcec.hash
rename to buildroot/package/libcec/libcec.hash
diff --git a/software/package/libcec/libcec.mk b/buildroot/package/libcec/libcec.mk
similarity index 100%
rename from software/package/libcec/libcec.mk
rename to buildroot/package/libcec/libcec.mk
diff --git a/software/package/libcedarc/Config.in b/buildroot/package/libcedarc/Config.in
similarity index 100%
rename from software/package/libcedarc/Config.in
rename to buildroot/package/libcedarc/Config.in
diff --git a/software/package/libcedarc/libcedarc.mk b/buildroot/package/libcedarc/libcedarc.mk
similarity index 100%
rename from software/package/libcedarc/libcedarc.mk
rename to buildroot/package/libcedarc/libcedarc.mk
diff --git a/software/package/libcgi/Config.in b/buildroot/package/libcgi/Config.in
similarity index 100%
rename from software/package/libcgi/Config.in
rename to buildroot/package/libcgi/Config.in
diff --git a/software/package/libcgi/libcgi.hash b/buildroot/package/libcgi/libcgi.hash
similarity index 100%
rename from software/package/libcgi/libcgi.hash
rename to buildroot/package/libcgi/libcgi.hash
diff --git a/software/package/libcgi/libcgi.mk b/buildroot/package/libcgi/libcgi.mk
similarity index 100%
rename from software/package/libcgi/libcgi.mk
rename to buildroot/package/libcgi/libcgi.mk
diff --git a/software/package/libcgicc/0001-disable-documentation-option.patch b/buildroot/package/libcgicc/0001-disable-documentation-option.patch
similarity index 100%
rename from software/package/libcgicc/0001-disable-documentation-option.patch
rename to buildroot/package/libcgicc/0001-disable-documentation-option.patch
diff --git a/software/package/libcgicc/Config.in b/buildroot/package/libcgicc/Config.in
similarity index 100%
rename from software/package/libcgicc/Config.in
rename to buildroot/package/libcgicc/Config.in
diff --git a/software/package/libcgicc/libcgicc.hash b/buildroot/package/libcgicc/libcgicc.hash
similarity index 100%
rename from software/package/libcgicc/libcgicc.hash
rename to buildroot/package/libcgicc/libcgicc.hash
diff --git a/software/package/libcgicc/libcgicc.mk b/buildroot/package/libcgicc/libcgicc.mk
similarity index 100%
rename from software/package/libcgicc/libcgicc.mk
rename to buildroot/package/libcgicc/libcgicc.mk
diff --git a/software/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch b/buildroot/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch
similarity index 100%
rename from software/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch
rename to buildroot/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch
diff --git a/software/package/libcgroup/Config.in b/buildroot/package/libcgroup/Config.in
similarity index 100%
rename from software/package/libcgroup/Config.in
rename to buildroot/package/libcgroup/Config.in
diff --git a/software/package/libcgroup/libcgroup.hash b/buildroot/package/libcgroup/libcgroup.hash
similarity index 100%
rename from software/package/libcgroup/libcgroup.hash
rename to buildroot/package/libcgroup/libcgroup.hash
diff --git a/software/package/libcgroup/libcgroup.mk b/buildroot/package/libcgroup/libcgroup.mk
similarity index 100%
rename from software/package/libcgroup/libcgroup.mk
rename to buildroot/package/libcgroup/libcgroup.mk
diff --git a/software/package/libclc/Config.in b/buildroot/package/libclc/Config.in
similarity index 100%
rename from software/package/libclc/Config.in
rename to buildroot/package/libclc/Config.in
diff --git a/software/package/libclc/libclc.hash b/buildroot/package/libclc/libclc.hash
similarity index 100%
rename from software/package/libclc/libclc.hash
rename to buildroot/package/libclc/libclc.hash
diff --git a/software/package/libclc/libclc.mk b/buildroot/package/libclc/libclc.mk
similarity index 100%
rename from software/package/libclc/libclc.mk
rename to buildroot/package/libclc/libclc.mk
diff --git a/software/package/libcli/Config.in b/buildroot/package/libcli/Config.in
similarity index 100%
rename from software/package/libcli/Config.in
rename to buildroot/package/libcli/Config.in
diff --git a/software/package/libcli/libcli.hash b/buildroot/package/libcli/libcli.hash
similarity index 100%
rename from software/package/libcli/libcli.hash
rename to buildroot/package/libcli/libcli.hash
diff --git a/software/package/libcli/libcli.mk b/buildroot/package/libcli/libcli.mk
similarity index 100%
rename from software/package/libcli/libcli.mk
rename to buildroot/package/libcli/libcli.mk
diff --git a/software/package/libcoap/Config.in b/buildroot/package/libcoap/Config.in
similarity index 100%
rename from software/package/libcoap/Config.in
rename to buildroot/package/libcoap/Config.in
diff --git a/software/package/libcoap/libcoap.hash b/buildroot/package/libcoap/libcoap.hash
similarity index 100%
rename from software/package/libcoap/libcoap.hash
rename to buildroot/package/libcoap/libcoap.hash
diff --git a/software/package/libcoap/libcoap.mk b/buildroot/package/libcoap/libcoap.mk
similarity index 100%
rename from software/package/libcoap/libcoap.mk
rename to buildroot/package/libcoap/libcoap.mk
diff --git a/software/package/libcodec2/Config.in b/buildroot/package/libcodec2/Config.in
similarity index 100%
rename from software/package/libcodec2/Config.in
rename to buildroot/package/libcodec2/Config.in
diff --git a/software/package/libcodec2/libcodec2.hash b/buildroot/package/libcodec2/libcodec2.hash
similarity index 100%
rename from software/package/libcodec2/libcodec2.hash
rename to buildroot/package/libcodec2/libcodec2.hash
diff --git a/software/package/libcodec2/libcodec2.mk b/buildroot/package/libcodec2/libcodec2.mk
similarity index 100%
rename from software/package/libcodec2/libcodec2.mk
rename to buildroot/package/libcodec2/libcodec2.mk
diff --git a/software/package/libcofi/Config.in b/buildroot/package/libcofi/Config.in
similarity index 100%
rename from software/package/libcofi/Config.in
rename to buildroot/package/libcofi/Config.in
diff --git a/software/package/libcofi/libcofi.hash b/buildroot/package/libcofi/libcofi.hash
similarity index 100%
rename from software/package/libcofi/libcofi.hash
rename to buildroot/package/libcofi/libcofi.hash
diff --git a/software/package/libcofi/libcofi.mk b/buildroot/package/libcofi/libcofi.mk
similarity index 100%
rename from software/package/libcofi/libcofi.mk
rename to buildroot/package/libcofi/libcofi.mk
diff --git a/software/package/libconfig/0001-Add-disable-doc-option.patch b/buildroot/package/libconfig/0001-Add-disable-doc-option.patch
similarity index 100%
rename from software/package/libconfig/0001-Add-disable-doc-option.patch
rename to buildroot/package/libconfig/0001-Add-disable-doc-option.patch
diff --git a/software/package/libconfig/Config.in b/buildroot/package/libconfig/Config.in
similarity index 100%
rename from software/package/libconfig/Config.in
rename to buildroot/package/libconfig/Config.in
diff --git a/software/package/libconfig/libconfig.hash b/buildroot/package/libconfig/libconfig.hash
similarity index 100%
rename from software/package/libconfig/libconfig.hash
rename to buildroot/package/libconfig/libconfig.hash
diff --git a/software/package/libconfig/libconfig.mk b/buildroot/package/libconfig/libconfig.mk
similarity index 100%
rename from software/package/libconfig/libconfig.mk
rename to buildroot/package/libconfig/libconfig.mk
diff --git a/software/package/libconfuse/Config.in b/buildroot/package/libconfuse/Config.in
similarity index 100%
rename from software/package/libconfuse/Config.in
rename to buildroot/package/libconfuse/Config.in
diff --git a/software/package/libconfuse/libconfuse.hash b/buildroot/package/libconfuse/libconfuse.hash
similarity index 100%
rename from software/package/libconfuse/libconfuse.hash
rename to buildroot/package/libconfuse/libconfuse.hash
diff --git a/software/package/libconfuse/libconfuse.mk b/buildroot/package/libconfuse/libconfuse.mk
similarity index 100%
rename from software/package/libconfuse/libconfuse.mk
rename to buildroot/package/libconfuse/libconfuse.mk
diff --git a/software/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch b/buildroot/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch
similarity index 100%
rename from software/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch
rename to buildroot/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch
diff --git a/software/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch b/buildroot/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch
similarity index 100%
rename from software/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch
rename to buildroot/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch
diff --git a/software/package/libcorrect/Config.in b/buildroot/package/libcorrect/Config.in
similarity index 100%
rename from software/package/libcorrect/Config.in
rename to buildroot/package/libcorrect/Config.in
diff --git a/software/package/libcorrect/libcorrect.hash b/buildroot/package/libcorrect/libcorrect.hash
similarity index 100%
rename from software/package/libcorrect/libcorrect.hash
rename to buildroot/package/libcorrect/libcorrect.hash
diff --git a/software/package/libcorrect/libcorrect.mk b/buildroot/package/libcorrect/libcorrect.mk
similarity index 100%
rename from software/package/libcorrect/libcorrect.mk
rename to buildroot/package/libcorrect/libcorrect.mk
diff --git a/software/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch b/buildroot/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch
similarity index 100%
rename from software/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch
rename to buildroot/package/libcpprestsdk/0001-libcpprestsdk-fix-building-as-a-static-library.patch
diff --git a/software/package/libcpprestsdk/Config.in b/buildroot/package/libcpprestsdk/Config.in
similarity index 100%
rename from software/package/libcpprestsdk/Config.in
rename to buildroot/package/libcpprestsdk/Config.in
diff --git a/software/package/libcpprestsdk/libcpprestsdk.hash b/buildroot/package/libcpprestsdk/libcpprestsdk.hash
similarity index 100%
rename from software/package/libcpprestsdk/libcpprestsdk.hash
rename to buildroot/package/libcpprestsdk/libcpprestsdk.hash
diff --git a/software/package/libcpprestsdk/libcpprestsdk.mk b/buildroot/package/libcpprestsdk/libcpprestsdk.mk
similarity index 100%
rename from software/package/libcpprestsdk/libcpprestsdk.mk
rename to buildroot/package/libcpprestsdk/libcpprestsdk.mk
diff --git a/software/package/libcroco/Config.in b/buildroot/package/libcroco/Config.in
similarity index 100%
rename from software/package/libcroco/Config.in
rename to buildroot/package/libcroco/Config.in
diff --git a/software/package/libcroco/libcroco.hash b/buildroot/package/libcroco/libcroco.hash
similarity index 100%
rename from software/package/libcroco/libcroco.hash
rename to buildroot/package/libcroco/libcroco.hash
diff --git a/software/package/libcroco/libcroco.mk b/buildroot/package/libcroco/libcroco.mk
similarity index 100%
rename from software/package/libcroco/libcroco.mk
rename to buildroot/package/libcroco/libcroco.mk
diff --git a/software/package/libcrossguid/Config.in b/buildroot/package/libcrossguid/Config.in
similarity index 100%
rename from software/package/libcrossguid/Config.in
rename to buildroot/package/libcrossguid/Config.in
diff --git a/software/package/libcrossguid/libcrossguid.hash b/buildroot/package/libcrossguid/libcrossguid.hash
similarity index 100%
rename from software/package/libcrossguid/libcrossguid.hash
rename to buildroot/package/libcrossguid/libcrossguid.hash
diff --git a/software/package/libcrossguid/libcrossguid.mk b/buildroot/package/libcrossguid/libcrossguid.mk
similarity index 100%
rename from software/package/libcrossguid/libcrossguid.mk
rename to buildroot/package/libcrossguid/libcrossguid.mk
diff --git a/software/package/libcsv/Config.in b/buildroot/package/libcsv/Config.in
similarity index 100%
rename from software/package/libcsv/Config.in
rename to buildroot/package/libcsv/Config.in
diff --git a/software/package/libcsv/libcsv.hash b/buildroot/package/libcsv/libcsv.hash
similarity index 100%
rename from software/package/libcsv/libcsv.hash
rename to buildroot/package/libcsv/libcsv.hash
diff --git a/software/package/libcsv/libcsv.mk b/buildroot/package/libcsv/libcsv.mk
similarity index 100%
rename from software/package/libcsv/libcsv.mk
rename to buildroot/package/libcsv/libcsv.mk
diff --git a/software/package/libcue/Config.in b/buildroot/package/libcue/Config.in
similarity index 100%
rename from software/package/libcue/Config.in
rename to buildroot/package/libcue/Config.in
diff --git a/software/package/libcue/libcue.hash b/buildroot/package/libcue/libcue.hash
similarity index 100%
rename from software/package/libcue/libcue.hash
rename to buildroot/package/libcue/libcue.hash
diff --git a/software/package/libcue/libcue.mk b/buildroot/package/libcue/libcue.mk
similarity index 100%
rename from software/package/libcue/libcue.mk
rename to buildroot/package/libcue/libcue.mk
diff --git a/software/package/libcuefile/0001-fix-static-link.patch b/buildroot/package/libcuefile/0001-fix-static-link.patch
similarity index 100%
rename from software/package/libcuefile/0001-fix-static-link.patch
rename to buildroot/package/libcuefile/0001-fix-static-link.patch
diff --git a/software/package/libcuefile/Config.in b/buildroot/package/libcuefile/Config.in
similarity index 100%
rename from software/package/libcuefile/Config.in
rename to buildroot/package/libcuefile/Config.in
diff --git a/software/package/libcuefile/libcuefile.hash b/buildroot/package/libcuefile/libcuefile.hash
similarity index 100%
rename from software/package/libcuefile/libcuefile.hash
rename to buildroot/package/libcuefile/libcuefile.hash
diff --git a/software/package/libcuefile/libcuefile.mk b/buildroot/package/libcuefile/libcuefile.mk
similarity index 100%
rename from software/package/libcuefile/libcuefile.mk
rename to buildroot/package/libcuefile/libcuefile.mk
diff --git a/software/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in
similarity index 100%
rename from software/package/libcurl/Config.in
rename to buildroot/package/libcurl/Config.in
diff --git a/software/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash
similarity index 100%
rename from software/package/libcurl/libcurl.hash
rename to buildroot/package/libcurl/libcurl.hash
diff --git a/software/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk
similarity index 100%
rename from software/package/libcurl/libcurl.mk
rename to buildroot/package/libcurl/libcurl.mk
diff --git a/software/package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch b/buildroot/package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch
similarity index 100%
rename from software/package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch
rename to buildroot/package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch
diff --git a/software/package/libdaemon/Config.in b/buildroot/package/libdaemon/Config.in
similarity index 100%
rename from software/package/libdaemon/Config.in
rename to buildroot/package/libdaemon/Config.in
diff --git a/software/package/libdaemon/libdaemon.hash b/buildroot/package/libdaemon/libdaemon.hash
similarity index 100%
rename from software/package/libdaemon/libdaemon.hash
rename to buildroot/package/libdaemon/libdaemon.hash
diff --git a/software/package/libdaemon/libdaemon.mk b/buildroot/package/libdaemon/libdaemon.mk
similarity index 100%
rename from software/package/libdaemon/libdaemon.mk
rename to buildroot/package/libdaemon/libdaemon.mk
diff --git a/software/package/libdcadec/Config.in b/buildroot/package/libdcadec/Config.in
similarity index 100%
rename from software/package/libdcadec/Config.in
rename to buildroot/package/libdcadec/Config.in
diff --git a/software/package/libdcadec/libdcadec.hash b/buildroot/package/libdcadec/libdcadec.hash
similarity index 100%
rename from software/package/libdcadec/libdcadec.hash
rename to buildroot/package/libdcadec/libdcadec.hash
diff --git a/software/package/libdcadec/libdcadec.mk b/buildroot/package/libdcadec/libdcadec.mk
similarity index 100%
rename from software/package/libdcadec/libdcadec.mk
rename to buildroot/package/libdcadec/libdcadec.mk
diff --git a/software/package/libdmtx/Config.in b/buildroot/package/libdmtx/Config.in
similarity index 100%
rename from software/package/libdmtx/Config.in
rename to buildroot/package/libdmtx/Config.in
diff --git a/software/package/libdmtx/libdmtx.hash b/buildroot/package/libdmtx/libdmtx.hash
similarity index 100%
rename from software/package/libdmtx/libdmtx.hash
rename to buildroot/package/libdmtx/libdmtx.hash
diff --git a/software/package/libdmtx/libdmtx.mk b/buildroot/package/libdmtx/libdmtx.mk
similarity index 100%
rename from software/package/libdmtx/libdmtx.mk
rename to buildroot/package/libdmtx/libdmtx.mk
diff --git a/software/package/libdnet/0001-python-gcc.patch b/buildroot/package/libdnet/0001-python-gcc.patch
similarity index 100%
rename from software/package/libdnet/0001-python-gcc.patch
rename to buildroot/package/libdnet/0001-python-gcc.patch
diff --git a/software/package/libdnet/0002-python-makefile.patch b/buildroot/package/libdnet/0002-python-makefile.patch
similarity index 100%
rename from software/package/libdnet/0002-python-makefile.patch
rename to buildroot/package/libdnet/0002-python-makefile.patch
diff --git a/software/package/libdnet/Config.in b/buildroot/package/libdnet/Config.in
similarity index 100%
rename from software/package/libdnet/Config.in
rename to buildroot/package/libdnet/Config.in
diff --git a/software/package/libdnet/libdnet.hash b/buildroot/package/libdnet/libdnet.hash
similarity index 100%
rename from software/package/libdnet/libdnet.hash
rename to buildroot/package/libdnet/libdnet.hash
diff --git a/software/package/libdnet/libdnet.mk b/buildroot/package/libdnet/libdnet.mk
similarity index 100%
rename from software/package/libdnet/libdnet.mk
rename to buildroot/package/libdnet/libdnet.mk
diff --git a/software/package/libdri2/Config.in b/buildroot/package/libdri2/Config.in
similarity index 100%
rename from software/package/libdri2/Config.in
rename to buildroot/package/libdri2/Config.in
diff --git a/software/package/libdri2/libdri2.hash b/buildroot/package/libdri2/libdri2.hash
similarity index 100%
rename from software/package/libdri2/libdri2.hash
rename to buildroot/package/libdri2/libdri2.hash
diff --git a/software/package/libdri2/libdri2.mk b/buildroot/package/libdri2/libdri2.mk
similarity index 100%
rename from software/package/libdri2/libdri2.mk
rename to buildroot/package/libdri2/libdri2.mk
diff --git a/software/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch b/buildroot/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch
similarity index 100%
rename from software/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch
rename to buildroot/package/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch
diff --git a/software/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch b/buildroot/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch
similarity index 100%
rename from software/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch
rename to buildroot/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch
diff --git a/software/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch b/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch
similarity index 100%
rename from software/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch
rename to buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch
diff --git a/software/package/libdrm/0004-meson.build-enable-static-build.patch b/buildroot/package/libdrm/0004-meson.build-enable-static-build.patch
similarity index 100%
rename from software/package/libdrm/0004-meson.build-enable-static-build.patch
rename to buildroot/package/libdrm/0004-meson.build-enable-static-build.patch
diff --git a/software/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch b/buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch
similarity index 100%
rename from software/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch
rename to buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch
diff --git a/software/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch b/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch
similarity index 100%
rename from software/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch
rename to buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch
diff --git a/software/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch b/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch
similarity index 100%
rename from software/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch
rename to buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch
diff --git a/software/package/libdrm/Config.in b/buildroot/package/libdrm/Config.in
similarity index 100%
rename from software/package/libdrm/Config.in
rename to buildroot/package/libdrm/Config.in
diff --git a/software/package/libdrm/libdrm.hash b/buildroot/package/libdrm/libdrm.hash
similarity index 100%
rename from software/package/libdrm/libdrm.hash
rename to buildroot/package/libdrm/libdrm.hash
diff --git a/software/package/libdrm/libdrm.mk b/buildroot/package/libdrm/libdrm.mk
similarity index 100%
rename from software/package/libdrm/libdrm.mk
rename to buildroot/package/libdrm/libdrm.mk
diff --git a/software/package/libdvbcsa/0001-altivec-powerpc64.patch b/buildroot/package/libdvbcsa/0001-altivec-powerpc64.patch
similarity index 100%
rename from software/package/libdvbcsa/0001-altivec-powerpc64.patch
rename to buildroot/package/libdvbcsa/0001-altivec-powerpc64.patch
diff --git a/software/package/libdvbcsa/Config.in b/buildroot/package/libdvbcsa/Config.in
similarity index 100%
rename from software/package/libdvbcsa/Config.in
rename to buildroot/package/libdvbcsa/Config.in
diff --git a/software/package/libdvbcsa/libdvbcsa.hash b/buildroot/package/libdvbcsa/libdvbcsa.hash
similarity index 100%
rename from software/package/libdvbcsa/libdvbcsa.hash
rename to buildroot/package/libdvbcsa/libdvbcsa.hash
diff --git a/software/package/libdvbcsa/libdvbcsa.mk b/buildroot/package/libdvbcsa/libdvbcsa.mk
similarity index 100%
rename from software/package/libdvbcsa/libdvbcsa.mk
rename to buildroot/package/libdvbcsa/libdvbcsa.mk
diff --git a/software/package/libdvbpsi/Config.in b/buildroot/package/libdvbpsi/Config.in
similarity index 100%
rename from software/package/libdvbpsi/Config.in
rename to buildroot/package/libdvbpsi/Config.in
diff --git a/software/package/libdvbpsi/libdvbpsi.hash b/buildroot/package/libdvbpsi/libdvbpsi.hash
similarity index 100%
rename from software/package/libdvbpsi/libdvbpsi.hash
rename to buildroot/package/libdvbpsi/libdvbpsi.hash
diff --git a/software/package/libdvbpsi/libdvbpsi.mk b/buildroot/package/libdvbpsi/libdvbpsi.mk
similarity index 100%
rename from software/package/libdvbpsi/libdvbpsi.mk
rename to buildroot/package/libdvbpsi/libdvbpsi.mk
diff --git a/software/package/libdvbsi/Config.in b/buildroot/package/libdvbsi/Config.in
similarity index 100%
rename from software/package/libdvbsi/Config.in
rename to buildroot/package/libdvbsi/Config.in
diff --git a/software/package/libdvbsi/libdvbsi.hash b/buildroot/package/libdvbsi/libdvbsi.hash
similarity index 100%
rename from software/package/libdvbsi/libdvbsi.hash
rename to buildroot/package/libdvbsi/libdvbsi.hash
diff --git a/software/package/libdvbsi/libdvbsi.mk b/buildroot/package/libdvbsi/libdvbsi.mk
similarity index 100%
rename from software/package/libdvbsi/libdvbsi.mk
rename to buildroot/package/libdvbsi/libdvbsi.mk
diff --git a/software/package/libdvdcss/Config.in b/buildroot/package/libdvdcss/Config.in
similarity index 100%
rename from software/package/libdvdcss/Config.in
rename to buildroot/package/libdvdcss/Config.in
diff --git a/software/package/libdvdcss/libdvdcss.hash b/buildroot/package/libdvdcss/libdvdcss.hash
similarity index 100%
rename from software/package/libdvdcss/libdvdcss.hash
rename to buildroot/package/libdvdcss/libdvdcss.hash
diff --git a/software/package/libdvdcss/libdvdcss.mk b/buildroot/package/libdvdcss/libdvdcss.mk
similarity index 100%
rename from software/package/libdvdcss/libdvdcss.mk
rename to buildroot/package/libdvdcss/libdvdcss.mk
diff --git a/software/package/libdvdnav/Config.in b/buildroot/package/libdvdnav/Config.in
similarity index 100%
rename from software/package/libdvdnav/Config.in
rename to buildroot/package/libdvdnav/Config.in
diff --git a/software/package/libdvdnav/libdvdnav.hash b/buildroot/package/libdvdnav/libdvdnav.hash
similarity index 100%
rename from software/package/libdvdnav/libdvdnav.hash
rename to buildroot/package/libdvdnav/libdvdnav.hash
diff --git a/software/package/libdvdnav/libdvdnav.mk b/buildroot/package/libdvdnav/libdvdnav.mk
similarity index 100%
rename from software/package/libdvdnav/libdvdnav.mk
rename to buildroot/package/libdvdnav/libdvdnav.mk
diff --git a/software/package/libdvdread/Config.in b/buildroot/package/libdvdread/Config.in
similarity index 100%
rename from software/package/libdvdread/Config.in
rename to buildroot/package/libdvdread/Config.in
diff --git a/software/package/libdvdread/libdvdread.hash b/buildroot/package/libdvdread/libdvdread.hash
similarity index 100%
rename from software/package/libdvdread/libdvdread.hash
rename to buildroot/package/libdvdread/libdvdread.hash
diff --git a/software/package/libdvdread/libdvdread.mk b/buildroot/package/libdvdread/libdvdread.mk
similarity index 100%
rename from software/package/libdvdread/libdvdread.mk
rename to buildroot/package/libdvdread/libdvdread.mk
diff --git a/software/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch b/buildroot/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
similarity index 100%
rename from software/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
rename to buildroot/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
diff --git a/software/package/libeXosip2/Config.in b/buildroot/package/libeXosip2/Config.in
similarity index 100%
rename from software/package/libeXosip2/Config.in
rename to buildroot/package/libeXosip2/Config.in
diff --git a/software/package/libeXosip2/libeXosip2.hash b/buildroot/package/libeXosip2/libeXosip2.hash
similarity index 100%
rename from software/package/libeXosip2/libeXosip2.hash
rename to buildroot/package/libeXosip2/libeXosip2.hash
diff --git a/software/package/libeXosip2/libeXosip2.mk b/buildroot/package/libeXosip2/libeXosip2.mk
similarity index 100%
rename from software/package/libeXosip2/libeXosip2.mk
rename to buildroot/package/libeXosip2/libeXosip2.mk
diff --git a/software/package/libeastl/Config.in b/buildroot/package/libeastl/Config.in
similarity index 100%
rename from software/package/libeastl/Config.in
rename to buildroot/package/libeastl/Config.in
diff --git a/software/package/libeastl/libeastl.hash b/buildroot/package/libeastl/libeastl.hash
similarity index 100%
rename from software/package/libeastl/libeastl.hash
rename to buildroot/package/libeastl/libeastl.hash
diff --git a/software/package/libeastl/libeastl.mk b/buildroot/package/libeastl/libeastl.mk
similarity index 100%
rename from software/package/libeastl/libeastl.mk
rename to buildroot/package/libeastl/libeastl.mk
diff --git a/software/package/libebml/Config.in b/buildroot/package/libebml/Config.in
similarity index 100%
rename from software/package/libebml/Config.in
rename to buildroot/package/libebml/Config.in
diff --git a/software/package/libebml/libebml.hash b/buildroot/package/libebml/libebml.hash
similarity index 100%
rename from software/package/libebml/libebml.hash
rename to buildroot/package/libebml/libebml.hash
diff --git a/software/package/libebml/libebml.mk b/buildroot/package/libebml/libebml.mk
similarity index 100%
rename from software/package/libebml/libebml.mk
rename to buildroot/package/libebml/libebml.mk
diff --git a/software/package/libebur128/Config.in b/buildroot/package/libebur128/Config.in
similarity index 100%
rename from software/package/libebur128/Config.in
rename to buildroot/package/libebur128/Config.in
diff --git a/software/package/libebur128/libebur128.hash b/buildroot/package/libebur128/libebur128.hash
similarity index 100%
rename from software/package/libebur128/libebur128.hash
rename to buildroot/package/libebur128/libebur128.hash
diff --git a/software/package/libebur128/libebur128.mk b/buildroot/package/libebur128/libebur128.mk
similarity index 100%
rename from software/package/libebur128/libebur128.mk
rename to buildroot/package/libebur128/libebur128.mk
diff --git a/software/package/libedit/0001-check-bsd-functions-in-libbsd.patch b/buildroot/package/libedit/0001-check-bsd-functions-in-libbsd.patch
similarity index 100%
rename from software/package/libedit/0001-check-bsd-functions-in-libbsd.patch
rename to buildroot/package/libedit/0001-check-bsd-functions-in-libbsd.patch
diff --git a/software/package/libedit/Config.in b/buildroot/package/libedit/Config.in
similarity index 100%
rename from software/package/libedit/Config.in
rename to buildroot/package/libedit/Config.in
diff --git a/software/package/libedit/libedit.hash b/buildroot/package/libedit/libedit.hash
similarity index 100%
rename from software/package/libedit/libedit.hash
rename to buildroot/package/libedit/libedit.hash
diff --git a/software/package/libedit/libedit.mk b/buildroot/package/libedit/libedit.mk
similarity index 100%
rename from software/package/libedit/libedit.mk
rename to buildroot/package/libedit/libedit.mk
diff --git a/software/package/libee/Config.in b/buildroot/package/libee/Config.in
similarity index 100%
rename from software/package/libee/Config.in
rename to buildroot/package/libee/Config.in
diff --git a/software/package/libee/libee.hash b/buildroot/package/libee/libee.hash
similarity index 100%
rename from software/package/libee/libee.hash
rename to buildroot/package/libee/libee.hash
diff --git a/software/package/libee/libee.mk b/buildroot/package/libee/libee.mk
similarity index 100%
rename from software/package/libee/libee.mk
rename to buildroot/package/libee/libee.mk
diff --git a/software/package/libenca/Config.in b/buildroot/package/libenca/Config.in
similarity index 100%
rename from software/package/libenca/Config.in
rename to buildroot/package/libenca/Config.in
diff --git a/software/package/libenca/libenca.hash b/buildroot/package/libenca/libenca.hash
similarity index 100%
rename from software/package/libenca/libenca.hash
rename to buildroot/package/libenca/libenca.hash
diff --git a/software/package/libenca/libenca.mk b/buildroot/package/libenca/libenca.mk
similarity index 100%
rename from software/package/libenca/libenca.mk
rename to buildroot/package/libenca/libenca.mk
diff --git a/software/package/libepoxy/Config.in b/buildroot/package/libepoxy/Config.in
similarity index 100%
rename from software/package/libepoxy/Config.in
rename to buildroot/package/libepoxy/Config.in
diff --git a/software/package/libepoxy/libepoxy.hash b/buildroot/package/libepoxy/libepoxy.hash
similarity index 100%
rename from software/package/libepoxy/libepoxy.hash
rename to buildroot/package/libepoxy/libepoxy.hash
diff --git a/software/package/libepoxy/libepoxy.mk b/buildroot/package/libepoxy/libepoxy.mk
similarity index 100%
rename from software/package/libepoxy/libepoxy.mk
rename to buildroot/package/libepoxy/libepoxy.mk
diff --git a/software/package/liberation/Config.in b/buildroot/package/liberation/Config.in
similarity index 100%
rename from software/package/liberation/Config.in
rename to buildroot/package/liberation/Config.in
diff --git a/software/package/liberation/liberation.hash b/buildroot/package/liberation/liberation.hash
similarity index 100%
rename from software/package/liberation/liberation.hash
rename to buildroot/package/liberation/liberation.hash
diff --git a/software/package/liberation/liberation.mk b/buildroot/package/liberation/liberation.mk
similarity index 100%
rename from software/package/liberation/liberation.mk
rename to buildroot/package/liberation/liberation.mk
diff --git a/software/package/libesmtp/Config.in b/buildroot/package/libesmtp/Config.in
similarity index 100%
rename from software/package/libesmtp/Config.in
rename to buildroot/package/libesmtp/Config.in
diff --git a/software/package/libesmtp/libesmtp.hash b/buildroot/package/libesmtp/libesmtp.hash
similarity index 100%
rename from software/package/libesmtp/libesmtp.hash
rename to buildroot/package/libesmtp/libesmtp.hash
diff --git a/software/package/libesmtp/libesmtp.mk b/buildroot/package/libesmtp/libesmtp.mk
similarity index 100%
rename from software/package/libesmtp/libesmtp.mk
rename to buildroot/package/libesmtp/libesmtp.mk
diff --git a/software/package/libestr/Config.in b/buildroot/package/libestr/Config.in
similarity index 100%
rename from software/package/libestr/Config.in
rename to buildroot/package/libestr/Config.in
diff --git a/software/package/libestr/libestr.hash b/buildroot/package/libestr/libestr.hash
similarity index 100%
rename from software/package/libestr/libestr.hash
rename to buildroot/package/libestr/libestr.hash
diff --git a/software/package/libestr/libestr.mk b/buildroot/package/libestr/libestr.mk
similarity index 100%
rename from software/package/libestr/libestr.mk
rename to buildroot/package/libestr/libestr.mk
diff --git a/software/package/libev/Config.in b/buildroot/package/libev/Config.in
similarity index 100%
rename from software/package/libev/Config.in
rename to buildroot/package/libev/Config.in
diff --git a/software/package/libev/libev.hash b/buildroot/package/libev/libev.hash
similarity index 100%
rename from software/package/libev/libev.hash
rename to buildroot/package/libev/libev.hash
diff --git a/software/package/libev/libev.mk b/buildroot/package/libev/libev.mk
similarity index 100%
rename from software/package/libev/libev.mk
rename to buildroot/package/libev/libev.mk
diff --git a/software/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch b/buildroot/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch
similarity index 100%
rename from software/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch
rename to buildroot/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch
diff --git a/software/package/libevdev/Config.in b/buildroot/package/libevdev/Config.in
similarity index 100%
rename from software/package/libevdev/Config.in
rename to buildroot/package/libevdev/Config.in
diff --git a/software/package/libevdev/libevdev.hash b/buildroot/package/libevdev/libevdev.hash
similarity index 100%
rename from software/package/libevdev/libevdev.hash
rename to buildroot/package/libevdev/libevdev.hash
diff --git a/software/package/libevdev/libevdev.mk b/buildroot/package/libevdev/libevdev.mk
similarity index 100%
rename from software/package/libevdev/libevdev.mk
rename to buildroot/package/libevdev/libevdev.mk
diff --git a/software/package/libevent/Config.in b/buildroot/package/libevent/Config.in
similarity index 100%
rename from software/package/libevent/Config.in
rename to buildroot/package/libevent/Config.in
diff --git a/software/package/libevent/libevent.hash b/buildroot/package/libevent/libevent.hash
similarity index 100%
rename from software/package/libevent/libevent.hash
rename to buildroot/package/libevent/libevent.hash
diff --git a/software/package/libevent/libevent.mk b/buildroot/package/libevent/libevent.mk
similarity index 100%
rename from software/package/libevent/libevent.mk
rename to buildroot/package/libevent/libevent.mk
diff --git a/software/package/libexif/Config.in b/buildroot/package/libexif/Config.in
similarity index 100%
rename from software/package/libexif/Config.in
rename to buildroot/package/libexif/Config.in
diff --git a/software/package/libexif/libexif.hash b/buildroot/package/libexif/libexif.hash
similarity index 100%
rename from software/package/libexif/libexif.hash
rename to buildroot/package/libexif/libexif.hash
diff --git a/software/package/libexif/libexif.mk b/buildroot/package/libexif/libexif.mk
similarity index 100%
rename from software/package/libexif/libexif.mk
rename to buildroot/package/libexif/libexif.mk
diff --git a/software/package/libfastjson/Config.in b/buildroot/package/libfastjson/Config.in
similarity index 100%
rename from software/package/libfastjson/Config.in
rename to buildroot/package/libfastjson/Config.in
diff --git a/software/package/libfastjson/libfastjson.hash b/buildroot/package/libfastjson/libfastjson.hash
similarity index 100%
rename from software/package/libfastjson/libfastjson.hash
rename to buildroot/package/libfastjson/libfastjson.hash
diff --git a/software/package/libfastjson/libfastjson.mk b/buildroot/package/libfastjson/libfastjson.mk
similarity index 100%
rename from software/package/libfastjson/libfastjson.mk
rename to buildroot/package/libfastjson/libfastjson.mk
diff --git a/software/package/libfcgi/0001-link-against-math.patch b/buildroot/package/libfcgi/0001-link-against-math.patch
similarity index 100%
rename from software/package/libfcgi/0001-link-against-math.patch
rename to buildroot/package/libfcgi/0001-link-against-math.patch
diff --git a/software/package/libfcgi/0002-disable-examples.patch b/buildroot/package/libfcgi/0002-disable-examples.patch
similarity index 100%
rename from software/package/libfcgi/0002-disable-examples.patch
rename to buildroot/package/libfcgi/0002-disable-examples.patch
diff --git a/software/package/libfcgi/Config.in b/buildroot/package/libfcgi/Config.in
similarity index 100%
rename from software/package/libfcgi/Config.in
rename to buildroot/package/libfcgi/Config.in
diff --git a/software/package/libfcgi/libfcgi.hash b/buildroot/package/libfcgi/libfcgi.hash
similarity index 100%
rename from software/package/libfcgi/libfcgi.hash
rename to buildroot/package/libfcgi/libfcgi.hash
diff --git a/software/package/libfcgi/libfcgi.mk b/buildroot/package/libfcgi/libfcgi.mk
similarity index 100%
rename from software/package/libfcgi/libfcgi.mk
rename to buildroot/package/libfcgi/libfcgi.mk
diff --git a/software/package/libffi/0001-Fix-installation-location-of-libffi.patch b/buildroot/package/libffi/0001-Fix-installation-location-of-libffi.patch
similarity index 100%
rename from software/package/libffi/0001-Fix-installation-location-of-libffi.patch
rename to buildroot/package/libffi/0001-Fix-installation-location-of-libffi.patch
diff --git a/software/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/buildroot/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch
similarity index 100%
rename from software/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch
rename to buildroot/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch
diff --git a/software/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/buildroot/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch
similarity index 100%
rename from software/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch
rename to buildroot/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch
diff --git a/software/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch b/buildroot/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch
similarity index 100%
rename from software/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch
rename to buildroot/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch
diff --git a/software/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch b/buildroot/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch
similarity index 100%
rename from software/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch
rename to buildroot/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch
diff --git a/software/package/libffi/0006-Address-platforms-with-no-__int128.patch b/buildroot/package/libffi/0006-Address-platforms-with-no-__int128.patch
similarity index 100%
rename from software/package/libffi/0006-Address-platforms-with-no-__int128.patch
rename to buildroot/package/libffi/0006-Address-platforms-with-no-__int128.patch
diff --git a/software/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch b/buildroot/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch
similarity index 100%
rename from software/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch
rename to buildroot/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch
diff --git a/software/package/libffi/Config.in b/buildroot/package/libffi/Config.in
similarity index 100%
rename from software/package/libffi/Config.in
rename to buildroot/package/libffi/Config.in
diff --git a/software/package/libffi/libffi.hash b/buildroot/package/libffi/libffi.hash
similarity index 100%
rename from software/package/libffi/libffi.hash
rename to buildroot/package/libffi/libffi.hash
diff --git a/software/package/libffi/libffi.mk b/buildroot/package/libffi/libffi.mk
similarity index 100%
rename from software/package/libffi/libffi.mk
rename to buildroot/package/libffi/libffi.mk
diff --git a/software/package/libfm-extra/Config.in b/buildroot/package/libfm-extra/Config.in
similarity index 100%
rename from software/package/libfm-extra/Config.in
rename to buildroot/package/libfm-extra/Config.in
diff --git a/software/package/libfm-extra/libfm-extra.hash b/buildroot/package/libfm-extra/libfm-extra.hash
similarity index 100%
rename from software/package/libfm-extra/libfm-extra.hash
rename to buildroot/package/libfm-extra/libfm-extra.hash
diff --git a/software/package/libfm-extra/libfm-extra.mk b/buildroot/package/libfm-extra/libfm-extra.mk
similarity index 100%
rename from software/package/libfm-extra/libfm-extra.mk
rename to buildroot/package/libfm-extra/libfm-extra.mk
diff --git a/software/package/libfm/0001-modules-fix-cross-compilation.patch b/buildroot/package/libfm/0001-modules-fix-cross-compilation.patch
similarity index 100%
rename from software/package/libfm/0001-modules-fix-cross-compilation.patch
rename to buildroot/package/libfm/0001-modules-fix-cross-compilation.patch
diff --git a/software/package/libfm/Config.in b/buildroot/package/libfm/Config.in
similarity index 100%
rename from software/package/libfm/Config.in
rename to buildroot/package/libfm/Config.in
diff --git a/software/package/libfm/libfm.hash b/buildroot/package/libfm/libfm.hash
similarity index 100%
rename from software/package/libfm/libfm.hash
rename to buildroot/package/libfm/libfm.hash
diff --git a/software/package/libfm/libfm.mk b/buildroot/package/libfm/libfm.mk
similarity index 100%
rename from software/package/libfm/libfm.mk
rename to buildroot/package/libfm/libfm.mk
diff --git a/software/package/libfreefare/Config.in b/buildroot/package/libfreefare/Config.in
similarity index 100%
rename from software/package/libfreefare/Config.in
rename to buildroot/package/libfreefare/Config.in
diff --git a/software/package/libfreefare/libfreefare.hash b/buildroot/package/libfreefare/libfreefare.hash
similarity index 100%
rename from software/package/libfreefare/libfreefare.hash
rename to buildroot/package/libfreefare/libfreefare.hash
diff --git a/software/package/libfreefare/libfreefare.mk b/buildroot/package/libfreefare/libfreefare.mk
similarity index 100%
rename from software/package/libfreefare/libfreefare.mk
rename to buildroot/package/libfreefare/libfreefare.mk
diff --git a/software/package/libfreeglut/Config.in b/buildroot/package/libfreeglut/Config.in
similarity index 100%
rename from software/package/libfreeglut/Config.in
rename to buildroot/package/libfreeglut/Config.in
diff --git a/software/package/libfreeglut/libfreeglut.hash b/buildroot/package/libfreeglut/libfreeglut.hash
similarity index 100%
rename from software/package/libfreeglut/libfreeglut.hash
rename to buildroot/package/libfreeglut/libfreeglut.hash
diff --git a/software/package/libfreeglut/libfreeglut.mk b/buildroot/package/libfreeglut/libfreeglut.mk
similarity index 100%
rename from software/package/libfreeglut/libfreeglut.mk
rename to buildroot/package/libfreeglut/libfreeglut.mk
diff --git a/software/package/libfreeimage/0001-no-root-install.patch b/buildroot/package/libfreeimage/0001-no-root-install.patch
similarity index 100%
rename from software/package/libfreeimage/0001-no-root-install.patch
rename to buildroot/package/libfreeimage/0001-no-root-install.patch
diff --git a/software/package/libfreeimage/0002-fix-cpuid-x86.patch b/buildroot/package/libfreeimage/0002-fix-cpuid-x86.patch
similarity index 100%
rename from software/package/libfreeimage/0002-fix-cpuid-x86.patch
rename to buildroot/package/libfreeimage/0002-fix-cpuid-x86.patch
diff --git a/software/package/libfreeimage/0003-fix-big-endian-os.patch b/buildroot/package/libfreeimage/0003-fix-big-endian-os.patch
similarity index 100%
rename from software/package/libfreeimage/0003-fix-big-endian-os.patch
rename to buildroot/package/libfreeimage/0003-fix-big-endian-os.patch
diff --git a/software/package/libfreeimage/Config.in b/buildroot/package/libfreeimage/Config.in
similarity index 100%
rename from software/package/libfreeimage/Config.in
rename to buildroot/package/libfreeimage/Config.in
diff --git a/software/package/libfreeimage/libfreeimage.hash b/buildroot/package/libfreeimage/libfreeimage.hash
similarity index 100%
rename from software/package/libfreeimage/libfreeimage.hash
rename to buildroot/package/libfreeimage/libfreeimage.hash
diff --git a/software/package/libfreeimage/libfreeimage.mk b/buildroot/package/libfreeimage/libfreeimage.mk
similarity index 100%
rename from software/package/libfreeimage/libfreeimage.mk
rename to buildroot/package/libfreeimage/libfreeimage.mk
diff --git a/software/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch b/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch
similarity index 100%
rename from software/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch
rename to buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch
diff --git a/software/package/libfribidi/Config.in b/buildroot/package/libfribidi/Config.in
similarity index 100%
rename from software/package/libfribidi/Config.in
rename to buildroot/package/libfribidi/Config.in
diff --git a/software/package/libfribidi/libfribidi.hash b/buildroot/package/libfribidi/libfribidi.hash
similarity index 100%
rename from software/package/libfribidi/libfribidi.hash
rename to buildroot/package/libfribidi/libfribidi.hash
diff --git a/software/package/libfribidi/libfribidi.mk b/buildroot/package/libfribidi/libfribidi.mk
similarity index 100%
rename from software/package/libfribidi/libfribidi.mk
rename to buildroot/package/libfribidi/libfribidi.mk
diff --git a/software/package/libftdi/0001_pkgconfig_libusb.patch b/buildroot/package/libftdi/0001_pkgconfig_libusb.patch
similarity index 100%
rename from software/package/libftdi/0001_pkgconfig_libusb.patch
rename to buildroot/package/libftdi/0001_pkgconfig_libusb.patch
diff --git a/software/package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch b/buildroot/package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch
similarity index 100%
rename from software/package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch
rename to buildroot/package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch
diff --git a/software/package/libftdi/Config.in b/buildroot/package/libftdi/Config.in
similarity index 100%
rename from software/package/libftdi/Config.in
rename to buildroot/package/libftdi/Config.in
diff --git a/software/package/libftdi/libftdi.hash b/buildroot/package/libftdi/libftdi.hash
similarity index 100%
rename from software/package/libftdi/libftdi.hash
rename to buildroot/package/libftdi/libftdi.hash
diff --git a/software/package/libftdi/libftdi.mk b/buildroot/package/libftdi/libftdi.mk
similarity index 100%
rename from software/package/libftdi/libftdi.mk
rename to buildroot/package/libftdi/libftdi.mk
diff --git a/software/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/buildroot/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
similarity index 100%
rename from software/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
rename to buildroot/package/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
diff --git a/software/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch b/buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch
similarity index 100%
rename from software/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch
rename to buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch
diff --git a/software/package/libftdi1/0003-cmake-find-swig.patch b/buildroot/package/libftdi1/0003-cmake-find-swig.patch
similarity index 100%
rename from software/package/libftdi1/0003-cmake-find-swig.patch
rename to buildroot/package/libftdi1/0003-cmake-find-swig.patch
diff --git a/software/package/libftdi1/0004-CMake-reorder-Python-detection.patch b/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch
similarity index 100%
rename from software/package/libftdi1/0004-CMake-reorder-Python-detection.patch
rename to buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch
diff --git a/software/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch b/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch
similarity index 100%
rename from software/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch
rename to buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch
diff --git a/software/package/libftdi1/Config.in b/buildroot/package/libftdi1/Config.in
similarity index 100%
rename from software/package/libftdi1/Config.in
rename to buildroot/package/libftdi1/Config.in
diff --git a/software/package/libftdi1/libftdi1.hash b/buildroot/package/libftdi1/libftdi1.hash
similarity index 100%
rename from software/package/libftdi1/libftdi1.hash
rename to buildroot/package/libftdi1/libftdi1.hash
diff --git a/software/package/libftdi1/libftdi1.mk b/buildroot/package/libftdi1/libftdi1.mk
similarity index 100%
rename from software/package/libftdi1/libftdi1.mk
rename to buildroot/package/libftdi1/libftdi1.mk
diff --git a/software/package/libfuse/0001-fix-aarch64-build.patch b/buildroot/package/libfuse/0001-fix-aarch64-build.patch
similarity index 100%
rename from software/package/libfuse/0001-fix-aarch64-build.patch
rename to buildroot/package/libfuse/0001-fix-aarch64-build.patch
diff --git a/software/package/libfuse/Config.in b/buildroot/package/libfuse/Config.in
similarity index 100%
rename from software/package/libfuse/Config.in
rename to buildroot/package/libfuse/Config.in
diff --git a/software/package/libfuse/libfuse.hash b/buildroot/package/libfuse/libfuse.hash
similarity index 100%
rename from software/package/libfuse/libfuse.hash
rename to buildroot/package/libfuse/libfuse.hash
diff --git a/software/package/libfuse/libfuse.mk b/buildroot/package/libfuse/libfuse.mk
similarity index 100%
rename from software/package/libfuse/libfuse.mk
rename to buildroot/package/libfuse/libfuse.mk
diff --git a/software/package/libg7221/Config.in b/buildroot/package/libg7221/Config.in
similarity index 100%
rename from software/package/libg7221/Config.in
rename to buildroot/package/libg7221/Config.in
diff --git a/software/package/libg7221/libg7221.hash b/buildroot/package/libg7221/libg7221.hash
similarity index 100%
rename from software/package/libg7221/libg7221.hash
rename to buildroot/package/libg7221/libg7221.hash
diff --git a/software/package/libg7221/libg7221.mk b/buildroot/package/libg7221/libg7221.mk
similarity index 100%
rename from software/package/libg7221/libg7221.mk
rename to buildroot/package/libg7221/libg7221.mk
diff --git a/software/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch b/buildroot/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch
similarity index 100%
rename from software/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch
rename to buildroot/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch
diff --git a/software/package/libgcrypt/0002-configure.ac-add-an-option-to-disable-tests.patch b/buildroot/package/libgcrypt/0002-configure.ac-add-an-option-to-disable-tests.patch
similarity index 100%
rename from software/package/libgcrypt/0002-configure.ac-add-an-option-to-disable-tests.patch
rename to buildroot/package/libgcrypt/0002-configure.ac-add-an-option-to-disable-tests.patch
diff --git a/software/package/libgcrypt/Config.in b/buildroot/package/libgcrypt/Config.in
similarity index 100%
rename from software/package/libgcrypt/Config.in
rename to buildroot/package/libgcrypt/Config.in
diff --git a/software/package/libgcrypt/libgcrypt.hash b/buildroot/package/libgcrypt/libgcrypt.hash
similarity index 100%
rename from software/package/libgcrypt/libgcrypt.hash
rename to buildroot/package/libgcrypt/libgcrypt.hash
diff --git a/software/package/libgcrypt/libgcrypt.mk b/buildroot/package/libgcrypt/libgcrypt.mk
similarity index 100%
rename from software/package/libgcrypt/libgcrypt.mk
rename to buildroot/package/libgcrypt/libgcrypt.mk
diff --git a/software/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch b/buildroot/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
similarity index 100%
rename from software/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
rename to buildroot/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
diff --git a/software/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch b/buildroot/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
similarity index 100%
rename from software/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
rename to buildroot/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
diff --git a/software/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch b/buildroot/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch
similarity index 100%
rename from software/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch
rename to buildroot/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch
diff --git a/software/package/libgdiplus/Config.in b/buildroot/package/libgdiplus/Config.in
similarity index 100%
rename from software/package/libgdiplus/Config.in
rename to buildroot/package/libgdiplus/Config.in
diff --git a/software/package/libgdiplus/libgdiplus.hash b/buildroot/package/libgdiplus/libgdiplus.hash
similarity index 100%
rename from software/package/libgdiplus/libgdiplus.hash
rename to buildroot/package/libgdiplus/libgdiplus.hash
diff --git a/software/package/libgdiplus/libgdiplus.mk b/buildroot/package/libgdiplus/libgdiplus.mk
similarity index 100%
rename from software/package/libgdiplus/libgdiplus.mk
rename to buildroot/package/libgdiplus/libgdiplus.mk
diff --git a/software/package/libgee/Config.in b/buildroot/package/libgee/Config.in
similarity index 100%
rename from software/package/libgee/Config.in
rename to buildroot/package/libgee/Config.in
diff --git a/software/package/libgee/libgee.hash b/buildroot/package/libgee/libgee.hash
similarity index 100%
rename from software/package/libgee/libgee.hash
rename to buildroot/package/libgee/libgee.hash
diff --git a/software/package/libgee/libgee.mk b/buildroot/package/libgee/libgee.mk
similarity index 100%
rename from software/package/libgee/libgee.mk
rename to buildroot/package/libgee/libgee.mk
diff --git a/software/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch b/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch
similarity index 100%
rename from software/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch
rename to buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch
diff --git a/software/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch b/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch
similarity index 100%
rename from software/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch
rename to buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch
diff --git a/software/package/libgeotiff/Config.in b/buildroot/package/libgeotiff/Config.in
similarity index 100%
rename from software/package/libgeotiff/Config.in
rename to buildroot/package/libgeotiff/Config.in
diff --git a/software/package/libgeotiff/libgeotiff.hash b/buildroot/package/libgeotiff/libgeotiff.hash
similarity index 100%
rename from software/package/libgeotiff/libgeotiff.hash
rename to buildroot/package/libgeotiff/libgeotiff.hash
diff --git a/software/package/libgeotiff/libgeotiff.mk b/buildroot/package/libgeotiff/libgeotiff.mk
similarity index 100%
rename from software/package/libgeotiff/libgeotiff.mk
rename to buildroot/package/libgeotiff/libgeotiff.mk
diff --git a/software/package/libgit2/Config.in b/buildroot/package/libgit2/Config.in
similarity index 100%
rename from software/package/libgit2/Config.in
rename to buildroot/package/libgit2/Config.in
diff --git a/software/package/libgit2/libgit2.hash b/buildroot/package/libgit2/libgit2.hash
similarity index 100%
rename from software/package/libgit2/libgit2.hash
rename to buildroot/package/libgit2/libgit2.hash
diff --git a/software/package/libgit2/libgit2.mk b/buildroot/package/libgit2/libgit2.mk
similarity index 100%
rename from software/package/libgit2/libgit2.mk
rename to buildroot/package/libgit2/libgit2.mk
diff --git a/software/package/libglade/Config.in b/buildroot/package/libglade/Config.in
similarity index 100%
rename from software/package/libglade/Config.in
rename to buildroot/package/libglade/Config.in
diff --git a/software/package/libglade/libglade.hash b/buildroot/package/libglade/libglade.hash
similarity index 100%
rename from software/package/libglade/libglade.hash
rename to buildroot/package/libglade/libglade.hash
diff --git a/software/package/libglade/libglade.mk b/buildroot/package/libglade/libglade.mk
similarity index 100%
rename from software/package/libglade/libglade.mk
rename to buildroot/package/libglade/libglade.mk
diff --git a/software/package/libglew/Config.in b/buildroot/package/libglew/Config.in
similarity index 100%
rename from software/package/libglew/Config.in
rename to buildroot/package/libglew/Config.in
diff --git a/software/package/libglew/libglew.hash b/buildroot/package/libglew/libglew.hash
similarity index 100%
rename from software/package/libglew/libglew.hash
rename to buildroot/package/libglew/libglew.hash
diff --git a/software/package/libglew/libglew.mk b/buildroot/package/libglew/libglew.mk
similarity index 100%
rename from software/package/libglew/libglew.mk
rename to buildroot/package/libglew/libglew.mk
diff --git a/software/package/libglfw/Config.in b/buildroot/package/libglfw/Config.in
similarity index 100%
rename from software/package/libglfw/Config.in
rename to buildroot/package/libglfw/Config.in
diff --git a/software/package/libglfw/libglfw.hash b/buildroot/package/libglfw/libglfw.hash
similarity index 100%
rename from software/package/libglfw/libglfw.hash
rename to buildroot/package/libglfw/libglfw.hash
diff --git a/software/package/libglfw/libglfw.mk b/buildroot/package/libglfw/libglfw.mk
similarity index 100%
rename from software/package/libglfw/libglfw.mk
rename to buildroot/package/libglfw/libglfw.mk
diff --git a/software/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch
similarity index 100%
rename from software/package/libglib2/0001-fix-compile-time-atomic-detection.patch
rename to buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch
diff --git a/software/package/libglib2/0002-allow-explicit-disabling-of-tests.patch b/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch
similarity index 100%
rename from software/package/libglib2/0002-allow-explicit-disabling-of-tests.patch
rename to buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch
diff --git a/software/package/libglib2/0003-remove-cpp-requirement.patch b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch
similarity index 100%
rename from software/package/libglib2/0003-remove-cpp-requirement.patch
rename to buildroot/package/libglib2/0003-remove-cpp-requirement.patch
diff --git a/software/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch
similarity index 100%
rename from software/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch
rename to buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch
diff --git a/software/package/libglib2/Config.in b/buildroot/package/libglib2/Config.in
similarity index 100%
rename from software/package/libglib2/Config.in
rename to buildroot/package/libglib2/Config.in
diff --git a/software/package/libglib2/libglib2.hash b/buildroot/package/libglib2/libglib2.hash
similarity index 100%
rename from software/package/libglib2/libglib2.hash
rename to buildroot/package/libglib2/libglib2.hash
diff --git a/software/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk
similarity index 100%
rename from software/package/libglib2/libglib2.mk
rename to buildroot/package/libglib2/libglib2.mk
diff --git a/software/package/libglob/Config.in b/buildroot/package/libglob/Config.in
similarity index 100%
rename from software/package/libglob/Config.in
rename to buildroot/package/libglob/Config.in
diff --git a/software/package/libglob/libglob.hash b/buildroot/package/libglob/libglob.hash
similarity index 100%
rename from software/package/libglob/libglob.hash
rename to buildroot/package/libglob/libglob.hash
diff --git a/software/package/libglob/libglob.mk b/buildroot/package/libglob/libglob.mk
similarity index 100%
rename from software/package/libglob/libglob.mk
rename to buildroot/package/libglob/libglob.mk
diff --git a/software/package/libglu/Config.in b/buildroot/package/libglu/Config.in
similarity index 100%
rename from software/package/libglu/Config.in
rename to buildroot/package/libglu/Config.in
diff --git a/software/package/libglu/libglu.hash b/buildroot/package/libglu/libglu.hash
similarity index 100%
rename from software/package/libglu/libglu.hash
rename to buildroot/package/libglu/libglu.hash
diff --git a/software/package/libglu/libglu.mk b/buildroot/package/libglu/libglu.mk
similarity index 100%
rename from software/package/libglu/libglu.mk
rename to buildroot/package/libglu/libglu.mk
diff --git a/software/package/libgpg-error/Config.in b/buildroot/package/libgpg-error/Config.in
similarity index 100%
rename from software/package/libgpg-error/Config.in
rename to buildroot/package/libgpg-error/Config.in
diff --git a/software/package/libgpg-error/libgpg-error.hash b/buildroot/package/libgpg-error/libgpg-error.hash
similarity index 100%
rename from software/package/libgpg-error/libgpg-error.hash
rename to buildroot/package/libgpg-error/libgpg-error.hash
diff --git a/software/package/libgpg-error/libgpg-error.mk b/buildroot/package/libgpg-error/libgpg-error.mk
similarity index 100%
rename from software/package/libgpg-error/libgpg-error.mk
rename to buildroot/package/libgpg-error/libgpg-error.mk
diff --git a/software/package/libgpgme/Config.in b/buildroot/package/libgpgme/Config.in
similarity index 100%
rename from software/package/libgpgme/Config.in
rename to buildroot/package/libgpgme/Config.in
diff --git a/software/package/libgpgme/libgpgme.hash b/buildroot/package/libgpgme/libgpgme.hash
similarity index 100%
rename from software/package/libgpgme/libgpgme.hash
rename to buildroot/package/libgpgme/libgpgme.hash
diff --git a/software/package/libgpgme/libgpgme.mk b/buildroot/package/libgpgme/libgpgme.mk
similarity index 100%
rename from software/package/libgpgme/libgpgme.mk
rename to buildroot/package/libgpgme/libgpgme.mk
diff --git a/software/package/libgphoto2/Config.in b/buildroot/package/libgphoto2/Config.in
similarity index 100%
rename from software/package/libgphoto2/Config.in
rename to buildroot/package/libgphoto2/Config.in
diff --git a/software/package/libgphoto2/libgphoto2.hash b/buildroot/package/libgphoto2/libgphoto2.hash
similarity index 100%
rename from software/package/libgphoto2/libgphoto2.hash
rename to buildroot/package/libgphoto2/libgphoto2.hash
diff --git a/software/package/libgphoto2/libgphoto2.mk b/buildroot/package/libgphoto2/libgphoto2.mk
similarity index 100%
rename from software/package/libgphoto2/libgphoto2.mk
rename to buildroot/package/libgphoto2/libgphoto2.mk
diff --git a/software/package/libgpiod/Config.in b/buildroot/package/libgpiod/Config.in
similarity index 100%
rename from software/package/libgpiod/Config.in
rename to buildroot/package/libgpiod/Config.in
diff --git a/software/package/libgpiod/libgpiod.hash b/buildroot/package/libgpiod/libgpiod.hash
similarity index 100%
rename from software/package/libgpiod/libgpiod.hash
rename to buildroot/package/libgpiod/libgpiod.hash
diff --git a/software/package/libgpiod/libgpiod.mk b/buildroot/package/libgpiod/libgpiod.mk
similarity index 100%
rename from software/package/libgpiod/libgpiod.mk
rename to buildroot/package/libgpiod/libgpiod.mk
diff --git a/software/package/libgsasl/Config.in b/buildroot/package/libgsasl/Config.in
similarity index 100%
rename from software/package/libgsasl/Config.in
rename to buildroot/package/libgsasl/Config.in
diff --git a/software/package/libgsasl/libgsasl.hash b/buildroot/package/libgsasl/libgsasl.hash
similarity index 100%
rename from software/package/libgsasl/libgsasl.hash
rename to buildroot/package/libgsasl/libgsasl.hash
diff --git a/software/package/libgsasl/libgsasl.mk b/buildroot/package/libgsasl/libgsasl.mk
similarity index 100%
rename from software/package/libgsasl/libgsasl.mk
rename to buildroot/package/libgsasl/libgsasl.mk
diff --git a/software/package/libgsm/0001-misc-fixes-from-archlinux.patch b/buildroot/package/libgsm/0001-misc-fixes-from-archlinux.patch
similarity index 100%
rename from software/package/libgsm/0001-misc-fixes-from-archlinux.patch
rename to buildroot/package/libgsm/0001-misc-fixes-from-archlinux.patch
diff --git a/software/package/libgsm/Config.in b/buildroot/package/libgsm/Config.in
similarity index 100%
rename from software/package/libgsm/Config.in
rename to buildroot/package/libgsm/Config.in
diff --git a/software/package/libgsm/libgsm.hash b/buildroot/package/libgsm/libgsm.hash
similarity index 100%
rename from software/package/libgsm/libgsm.hash
rename to buildroot/package/libgsm/libgsm.hash
diff --git a/software/package/libgsm/libgsm.mk b/buildroot/package/libgsm/libgsm.mk
similarity index 100%
rename from software/package/libgsm/libgsm.mk
rename to buildroot/package/libgsm/libgsm.mk
diff --git a/software/package/libgta/Config.in b/buildroot/package/libgta/Config.in
similarity index 100%
rename from software/package/libgta/Config.in
rename to buildroot/package/libgta/Config.in
diff --git a/software/package/libgta/libgta.hash b/buildroot/package/libgta/libgta.hash
similarity index 100%
rename from software/package/libgta/libgta.hash
rename to buildroot/package/libgta/libgta.hash
diff --git a/software/package/libgta/libgta.mk b/buildroot/package/libgta/libgta.mk
similarity index 100%
rename from software/package/libgta/libgta.mk
rename to buildroot/package/libgta/libgta.mk
diff --git a/software/package/libgtk2/0001-reduce-dependencies.patch b/buildroot/package/libgtk2/0001-reduce-dependencies.patch
similarity index 100%
rename from software/package/libgtk2/0001-reduce-dependencies.patch
rename to buildroot/package/libgtk2/0001-reduce-dependencies.patch
diff --git a/software/package/libgtk2/Config.in b/buildroot/package/libgtk2/Config.in
similarity index 100%
rename from software/package/libgtk2/Config.in
rename to buildroot/package/libgtk2/Config.in
diff --git a/software/package/libgtk2/libgtk2.hash b/buildroot/package/libgtk2/libgtk2.hash
similarity index 100%
rename from software/package/libgtk2/libgtk2.hash
rename to buildroot/package/libgtk2/libgtk2.hash
diff --git a/software/package/libgtk2/libgtk2.mk b/buildroot/package/libgtk2/libgtk2.mk
similarity index 100%
rename from software/package/libgtk2/libgtk2.mk
rename to buildroot/package/libgtk2/libgtk2.mk
diff --git a/software/package/libgtk3/0001-no-gtk-doc.patch b/buildroot/package/libgtk3/0001-no-gtk-doc.patch
similarity index 100%
rename from software/package/libgtk3/0001-no-gtk-doc.patch
rename to buildroot/package/libgtk3/0001-no-gtk-doc.patch
diff --git a/software/package/libgtk3/0002-fix-introspection-check.patch b/buildroot/package/libgtk3/0002-fix-introspection-check.patch
similarity index 100%
rename from software/package/libgtk3/0002-fix-introspection-check.patch
rename to buildroot/package/libgtk3/0002-fix-introspection-check.patch
diff --git a/software/package/libgtk3/0003-disable-atk-bridge.patch b/buildroot/package/libgtk3/0003-disable-atk-bridge.patch
similarity index 100%
rename from software/package/libgtk3/0003-disable-atk-bridge.patch
rename to buildroot/package/libgtk3/0003-disable-atk-bridge.patch
diff --git a/software/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/buildroot/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
similarity index 100%
rename from software/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
rename to buildroot/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
diff --git a/software/package/libgtk3/Config.in b/buildroot/package/libgtk3/Config.in
similarity index 100%
rename from software/package/libgtk3/Config.in
rename to buildroot/package/libgtk3/Config.in
diff --git a/software/package/libgtk3/libgtk3.hash b/buildroot/package/libgtk3/libgtk3.hash
similarity index 100%
rename from software/package/libgtk3/libgtk3.hash
rename to buildroot/package/libgtk3/libgtk3.hash
diff --git a/software/package/libgtk3/libgtk3.mk b/buildroot/package/libgtk3/libgtk3.mk
similarity index 100%
rename from software/package/libgtk3/libgtk3.mk
rename to buildroot/package/libgtk3/libgtk3.mk
diff --git a/software/package/libgudev/Config.in b/buildroot/package/libgudev/Config.in
similarity index 100%
rename from software/package/libgudev/Config.in
rename to buildroot/package/libgudev/Config.in
diff --git a/software/package/libgudev/libgudev.hash b/buildroot/package/libgudev/libgudev.hash
similarity index 100%
rename from software/package/libgudev/libgudev.hash
rename to buildroot/package/libgudev/libgudev.hash
diff --git a/software/package/libgudev/libgudev.mk b/buildroot/package/libgudev/libgudev.mk
similarity index 100%
rename from software/package/libgudev/libgudev.mk
rename to buildroot/package/libgudev/libgudev.mk
diff --git a/software/package/libhdhomerun/0001-dont-strip.patch b/buildroot/package/libhdhomerun/0001-dont-strip.patch
similarity index 100%
rename from software/package/libhdhomerun/0001-dont-strip.patch
rename to buildroot/package/libhdhomerun/0001-dont-strip.patch
diff --git a/software/package/libhdhomerun/Config.in b/buildroot/package/libhdhomerun/Config.in
similarity index 100%
rename from software/package/libhdhomerun/Config.in
rename to buildroot/package/libhdhomerun/Config.in
diff --git a/software/package/libhdhomerun/libhdhomerun.hash b/buildroot/package/libhdhomerun/libhdhomerun.hash
similarity index 100%
rename from software/package/libhdhomerun/libhdhomerun.hash
rename to buildroot/package/libhdhomerun/libhdhomerun.hash
diff --git a/software/package/libhdhomerun/libhdhomerun.mk b/buildroot/package/libhdhomerun/libhdhomerun.mk
similarity index 100%
rename from software/package/libhdhomerun/libhdhomerun.mk
rename to buildroot/package/libhdhomerun/libhdhomerun.mk
diff --git a/software/package/libhid/0001-dont-fiddle-with-debug-flags.patch b/buildroot/package/libhid/0001-dont-fiddle-with-debug-flags.patch
similarity index 100%
rename from software/package/libhid/0001-dont-fiddle-with-debug-flags.patch
rename to buildroot/package/libhid/0001-dont-fiddle-with-debug-flags.patch
diff --git a/software/package/libhid/0002-no-newline-in-ldflags.patch b/buildroot/package/libhid/0002-no-newline-in-ldflags.patch
similarity index 100%
rename from software/package/libhid/0002-no-newline-in-ldflags.patch
rename to buildroot/package/libhid/0002-no-newline-in-ldflags.patch
diff --git a/software/package/libhid/0003-uclinux.patch b/buildroot/package/libhid/0003-uclinux.patch
similarity index 100%
rename from software/package/libhid/0003-uclinux.patch
rename to buildroot/package/libhid/0003-uclinux.patch
diff --git a/software/package/libhid/Config.in b/buildroot/package/libhid/Config.in
similarity index 100%
rename from software/package/libhid/Config.in
rename to buildroot/package/libhid/Config.in
diff --git a/software/package/libhid/libhid.hash b/buildroot/package/libhid/libhid.hash
similarity index 100%
rename from software/package/libhid/libhid.hash
rename to buildroot/package/libhid/libhid.hash
diff --git a/software/package/libhid/libhid.mk b/buildroot/package/libhid/libhid.mk
similarity index 100%
rename from software/package/libhid/libhid.mk
rename to buildroot/package/libhid/libhid.mk
diff --git a/software/package/libhtp/Config.in b/buildroot/package/libhtp/Config.in
similarity index 100%
rename from software/package/libhtp/Config.in
rename to buildroot/package/libhtp/Config.in
diff --git a/software/package/libhtp/libhtp.hash b/buildroot/package/libhtp/libhtp.hash
similarity index 100%
rename from software/package/libhtp/libhtp.hash
rename to buildroot/package/libhtp/libhtp.hash
diff --git a/software/package/libhtp/libhtp.mk b/buildroot/package/libhtp/libhtp.mk
similarity index 100%
rename from software/package/libhtp/libhtp.mk
rename to buildroot/package/libhtp/libhtp.mk
diff --git a/software/package/libhttpparser/Config.in b/buildroot/package/libhttpparser/Config.in
similarity index 100%
rename from software/package/libhttpparser/Config.in
rename to buildroot/package/libhttpparser/Config.in
diff --git a/software/package/libhttpparser/libhttpparser.hash b/buildroot/package/libhttpparser/libhttpparser.hash
similarity index 100%
rename from software/package/libhttpparser/libhttpparser.hash
rename to buildroot/package/libhttpparser/libhttpparser.hash
diff --git a/software/package/libhttpparser/libhttpparser.mk b/buildroot/package/libhttpparser/libhttpparser.mk
similarity index 100%
rename from software/package/libhttpparser/libhttpparser.mk
rename to buildroot/package/libhttpparser/libhttpparser.mk
diff --git a/software/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch b/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
similarity index 100%
rename from software/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
rename to buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
diff --git a/software/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch b/buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch
similarity index 100%
rename from software/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch
rename to buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch
diff --git a/software/package/libhttpserver/Config.in b/buildroot/package/libhttpserver/Config.in
similarity index 100%
rename from software/package/libhttpserver/Config.in
rename to buildroot/package/libhttpserver/Config.in
diff --git a/software/package/libhttpserver/libhttpserver.hash b/buildroot/package/libhttpserver/libhttpserver.hash
similarity index 100%
rename from software/package/libhttpserver/libhttpserver.hash
rename to buildroot/package/libhttpserver/libhttpserver.hash
diff --git a/software/package/libhttpserver/libhttpserver.mk b/buildroot/package/libhttpserver/libhttpserver.mk
similarity index 100%
rename from software/package/libhttpserver/libhttpserver.mk
rename to buildroot/package/libhttpserver/libhttpserver.mk
diff --git a/software/package/libical/0001-no-tests.patch b/buildroot/package/libical/0001-no-tests.patch
similarity index 100%
rename from software/package/libical/0001-no-tests.patch
rename to buildroot/package/libical/0001-no-tests.patch
diff --git a/software/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch b/buildroot/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch
similarity index 100%
rename from software/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch
rename to buildroot/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch
diff --git a/software/package/libical/Config.in b/buildroot/package/libical/Config.in
similarity index 100%
rename from software/package/libical/Config.in
rename to buildroot/package/libical/Config.in
diff --git a/software/package/libical/libical.hash b/buildroot/package/libical/libical.hash
similarity index 100%
rename from software/package/libical/libical.hash
rename to buildroot/package/libical/libical.hash
diff --git a/software/package/libical/libical.mk b/buildroot/package/libical/libical.mk
similarity index 100%
rename from software/package/libical/libical.mk
rename to buildroot/package/libical/libical.mk
diff --git a/software/package/libiconv/Config.in b/buildroot/package/libiconv/Config.in
similarity index 100%
rename from software/package/libiconv/Config.in
rename to buildroot/package/libiconv/Config.in
diff --git a/software/package/libiconv/libiconv.hash b/buildroot/package/libiconv/libiconv.hash
similarity index 100%
rename from software/package/libiconv/libiconv.hash
rename to buildroot/package/libiconv/libiconv.hash
diff --git a/software/package/libiconv/libiconv.mk b/buildroot/package/libiconv/libiconv.mk
similarity index 100%
rename from software/package/libiconv/libiconv.mk
rename to buildroot/package/libiconv/libiconv.mk
diff --git a/software/package/libid3tag/Config.in b/buildroot/package/libid3tag/Config.in
similarity index 100%
rename from software/package/libid3tag/Config.in
rename to buildroot/package/libid3tag/Config.in
diff --git a/software/package/libid3tag/id3tag.pc b/buildroot/package/libid3tag/id3tag.pc
similarity index 100%
rename from software/package/libid3tag/id3tag.pc
rename to buildroot/package/libid3tag/id3tag.pc
diff --git a/software/package/libid3tag/libid3tag.hash b/buildroot/package/libid3tag/libid3tag.hash
similarity index 100%
rename from software/package/libid3tag/libid3tag.hash
rename to buildroot/package/libid3tag/libid3tag.hash
diff --git a/software/package/libid3tag/libid3tag.mk b/buildroot/package/libid3tag/libid3tag.mk
similarity index 100%
rename from software/package/libid3tag/libid3tag.mk
rename to buildroot/package/libid3tag/libid3tag.mk
diff --git a/software/package/libidn/Config.in b/buildroot/package/libidn/Config.in
similarity index 100%
rename from software/package/libidn/Config.in
rename to buildroot/package/libidn/Config.in
diff --git a/software/package/libidn/libidn.hash b/buildroot/package/libidn/libidn.hash
similarity index 100%
rename from software/package/libidn/libidn.hash
rename to buildroot/package/libidn/libidn.hash
diff --git a/software/package/libidn/libidn.mk b/buildroot/package/libidn/libidn.mk
similarity index 100%
rename from software/package/libidn/libidn.mk
rename to buildroot/package/libidn/libidn.mk
diff --git a/software/package/libidn2/Config.in b/buildroot/package/libidn2/Config.in
similarity index 100%
rename from software/package/libidn2/Config.in
rename to buildroot/package/libidn2/Config.in
diff --git a/software/package/libidn2/libidn2.hash b/buildroot/package/libidn2/libidn2.hash
similarity index 100%
rename from software/package/libidn2/libidn2.hash
rename to buildroot/package/libidn2/libidn2.hash
diff --git a/software/package/libidn2/libidn2.mk b/buildroot/package/libidn2/libidn2.mk
similarity index 100%
rename from software/package/libidn2/libidn2.mk
rename to buildroot/package/libidn2/libidn2.mk
diff --git a/software/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch b/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch
similarity index 100%
rename from software/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch
rename to buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch
diff --git a/software/package/libiio/Config.in b/buildroot/package/libiio/Config.in
similarity index 100%
rename from software/package/libiio/Config.in
rename to buildroot/package/libiio/Config.in
diff --git a/software/package/libiio/S99iiod b/buildroot/package/libiio/S99iiod
similarity index 100%
rename from software/package/libiio/S99iiod
rename to buildroot/package/libiio/S99iiod
diff --git a/software/package/libiio/libiio.hash b/buildroot/package/libiio/libiio.hash
similarity index 100%
rename from software/package/libiio/libiio.hash
rename to buildroot/package/libiio/libiio.hash
diff --git a/software/package/libiio/libiio.mk b/buildroot/package/libiio/libiio.mk
similarity index 100%
rename from software/package/libiio/libiio.mk
rename to buildroot/package/libiio/libiio.mk
diff --git a/software/package/libilbc/Config.in b/buildroot/package/libilbc/Config.in
similarity index 100%
rename from software/package/libilbc/Config.in
rename to buildroot/package/libilbc/Config.in
diff --git a/software/package/libilbc/libilbc.hash b/buildroot/package/libilbc/libilbc.hash
similarity index 100%
rename from software/package/libilbc/libilbc.hash
rename to buildroot/package/libilbc/libilbc.hash
diff --git a/software/package/libilbc/libilbc.mk b/buildroot/package/libilbc/libilbc.mk
similarity index 100%
rename from software/package/libilbc/libilbc.mk
rename to buildroot/package/libilbc/libilbc.mk
diff --git a/software/package/libimxvpuapi/Config.in b/buildroot/package/libimxvpuapi/Config.in
similarity index 100%
rename from software/package/libimxvpuapi/Config.in
rename to buildroot/package/libimxvpuapi/Config.in
diff --git a/software/package/libimxvpuapi/libimxvpuapi.hash b/buildroot/package/libimxvpuapi/libimxvpuapi.hash
similarity index 100%
rename from software/package/libimxvpuapi/libimxvpuapi.hash
rename to buildroot/package/libimxvpuapi/libimxvpuapi.hash
diff --git a/software/package/libimxvpuapi/libimxvpuapi.mk b/buildroot/package/libimxvpuapi/libimxvpuapi.mk
similarity index 100%
rename from software/package/libimxvpuapi/libimxvpuapi.mk
rename to buildroot/package/libimxvpuapi/libimxvpuapi.mk
diff --git a/software/package/libinput/Config.in b/buildroot/package/libinput/Config.in
similarity index 100%
rename from software/package/libinput/Config.in
rename to buildroot/package/libinput/Config.in
diff --git a/software/package/libinput/libinput.hash b/buildroot/package/libinput/libinput.hash
similarity index 100%
rename from software/package/libinput/libinput.hash
rename to buildroot/package/libinput/libinput.hash
diff --git a/software/package/libinput/libinput.mk b/buildroot/package/libinput/libinput.mk
similarity index 100%
rename from software/package/libinput/libinput.mk
rename to buildroot/package/libinput/libinput.mk
diff --git a/software/package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch b/buildroot/package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch
similarity index 100%
rename from software/package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch
rename to buildroot/package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch
diff --git a/software/package/libiqrf/0002-use-only-c-language.patch b/buildroot/package/libiqrf/0002-use-only-c-language.patch
similarity index 100%
rename from software/package/libiqrf/0002-use-only-c-language.patch
rename to buildroot/package/libiqrf/0002-use-only-c-language.patch
diff --git a/software/package/libiqrf/Config.in b/buildroot/package/libiqrf/Config.in
similarity index 100%
rename from software/package/libiqrf/Config.in
rename to buildroot/package/libiqrf/Config.in
diff --git a/software/package/libiqrf/libiqrf.hash b/buildroot/package/libiqrf/libiqrf.hash
similarity index 100%
rename from software/package/libiqrf/libiqrf.hash
rename to buildroot/package/libiqrf/libiqrf.hash
diff --git a/software/package/libiqrf/libiqrf.mk b/buildroot/package/libiqrf/libiqrf.mk
similarity index 100%
rename from software/package/libiqrf/libiqrf.mk
rename to buildroot/package/libiqrf/libiqrf.mk
diff --git a/software/package/libiscsi/Config.in b/buildroot/package/libiscsi/Config.in
similarity index 100%
rename from software/package/libiscsi/Config.in
rename to buildroot/package/libiscsi/Config.in
diff --git a/software/package/libiscsi/libiscsi.hash b/buildroot/package/libiscsi/libiscsi.hash
similarity index 100%
rename from software/package/libiscsi/libiscsi.hash
rename to buildroot/package/libiscsi/libiscsi.hash
diff --git a/software/package/libiscsi/libiscsi.mk b/buildroot/package/libiscsi/libiscsi.mk
similarity index 100%
rename from software/package/libiscsi/libiscsi.mk
rename to buildroot/package/libiscsi/libiscsi.mk
diff --git a/software/package/libite/Config.in b/buildroot/package/libite/Config.in
similarity index 100%
rename from software/package/libite/Config.in
rename to buildroot/package/libite/Config.in
diff --git a/software/package/libite/libite.hash b/buildroot/package/libite/libite.hash
similarity index 100%
rename from software/package/libite/libite.hash
rename to buildroot/package/libite/libite.hash
diff --git a/software/package/libite/libite.mk b/buildroot/package/libite/libite.mk
similarity index 100%
rename from software/package/libite/libite.mk
rename to buildroot/package/libite/libite.mk
diff --git a/software/package/libjpeg/libjpeg.hash b/buildroot/package/libjpeg/libjpeg.hash
similarity index 100%
rename from software/package/libjpeg/libjpeg.hash
rename to buildroot/package/libjpeg/libjpeg.hash
diff --git a/software/package/libjpeg/libjpeg.mk b/buildroot/package/libjpeg/libjpeg.mk
similarity index 100%
rename from software/package/libjpeg/libjpeg.mk
rename to buildroot/package/libjpeg/libjpeg.mk
diff --git a/software/package/libjpeg/libjpeg.pc.in b/buildroot/package/libjpeg/libjpeg.pc.in
similarity index 100%
rename from software/package/libjpeg/libjpeg.pc.in
rename to buildroot/package/libjpeg/libjpeg.pc.in
diff --git a/software/package/libjson/0001-fix-broken-makefile.patch b/buildroot/package/libjson/0001-fix-broken-makefile.patch
similarity index 100%
rename from software/package/libjson/0001-fix-broken-makefile.patch
rename to buildroot/package/libjson/0001-fix-broken-makefile.patch
diff --git a/software/package/libjson/Config.in b/buildroot/package/libjson/Config.in
similarity index 100%
rename from software/package/libjson/Config.in
rename to buildroot/package/libjson/Config.in
diff --git a/software/package/libjson/libjson.hash b/buildroot/package/libjson/libjson.hash
similarity index 100%
rename from software/package/libjson/libjson.hash
rename to buildroot/package/libjson/libjson.hash
diff --git a/software/package/libjson/libjson.mk b/buildroot/package/libjson/libjson.mk
similarity index 100%
rename from software/package/libjson/libjson.mk
rename to buildroot/package/libjson/libjson.mk
diff --git a/software/package/libkcapi/Config.in b/buildroot/package/libkcapi/Config.in
similarity index 100%
rename from software/package/libkcapi/Config.in
rename to buildroot/package/libkcapi/Config.in
diff --git a/software/package/libkcapi/libkcapi.hash b/buildroot/package/libkcapi/libkcapi.hash
similarity index 100%
rename from software/package/libkcapi/libkcapi.hash
rename to buildroot/package/libkcapi/libkcapi.hash
diff --git a/software/package/libkcapi/libkcapi.mk b/buildroot/package/libkcapi/libkcapi.mk
similarity index 100%
rename from software/package/libkcapi/libkcapi.mk
rename to buildroot/package/libkcapi/libkcapi.mk
diff --git a/software/package/libkrb5/Config.in b/buildroot/package/libkrb5/Config.in
similarity index 100%
rename from software/package/libkrb5/Config.in
rename to buildroot/package/libkrb5/Config.in
diff --git a/software/package/libkrb5/libkrb5.hash b/buildroot/package/libkrb5/libkrb5.hash
similarity index 100%
rename from software/package/libkrb5/libkrb5.hash
rename to buildroot/package/libkrb5/libkrb5.hash
diff --git a/software/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk
similarity index 100%
rename from software/package/libkrb5/libkrb5.mk
rename to buildroot/package/libkrb5/libkrb5.mk
diff --git a/software/package/libksba/Config.in b/buildroot/package/libksba/Config.in
similarity index 100%
rename from software/package/libksba/Config.in
rename to buildroot/package/libksba/Config.in
diff --git a/software/package/libksba/libksba.hash b/buildroot/package/libksba/libksba.hash
similarity index 100%
rename from software/package/libksba/libksba.hash
rename to buildroot/package/libksba/libksba.hash
diff --git a/software/package/libksba/libksba.mk b/buildroot/package/libksba/libksba.mk
similarity index 100%
rename from software/package/libksba/libksba.mk
rename to buildroot/package/libksba/libksba.mk
diff --git a/software/package/libldns/Config.in b/buildroot/package/libldns/Config.in
similarity index 100%
rename from software/package/libldns/Config.in
rename to buildroot/package/libldns/Config.in
diff --git a/software/package/libldns/libldns.hash b/buildroot/package/libldns/libldns.hash
similarity index 100%
rename from software/package/libldns/libldns.hash
rename to buildroot/package/libldns/libldns.hash
diff --git a/software/package/libldns/libldns.mk b/buildroot/package/libldns/libldns.mk
similarity index 100%
rename from software/package/libldns/libldns.mk
rename to buildroot/package/libldns/libldns.mk
diff --git a/software/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch b/buildroot/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch
similarity index 100%
rename from software/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch
rename to buildroot/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch
diff --git a/software/package/liblinear/0002-build-static-lib.patch b/buildroot/package/liblinear/0002-build-static-lib.patch
similarity index 100%
rename from software/package/liblinear/0002-build-static-lib.patch
rename to buildroot/package/liblinear/0002-build-static-lib.patch
diff --git a/software/package/liblinear/Config.in b/buildroot/package/liblinear/Config.in
similarity index 100%
rename from software/package/liblinear/Config.in
rename to buildroot/package/liblinear/Config.in
diff --git a/software/package/liblinear/liblinear.hash b/buildroot/package/liblinear/liblinear.hash
similarity index 100%
rename from software/package/liblinear/liblinear.hash
rename to buildroot/package/liblinear/liblinear.hash
diff --git a/software/package/liblinear/liblinear.mk b/buildroot/package/liblinear/liblinear.mk
similarity index 100%
rename from software/package/liblinear/liblinear.mk
rename to buildroot/package/liblinear/liblinear.mk
diff --git a/software/package/libllcp/Config.in b/buildroot/package/libllcp/Config.in
similarity index 100%
rename from software/package/libllcp/Config.in
rename to buildroot/package/libllcp/Config.in
diff --git a/software/package/libllcp/libllcp.hash b/buildroot/package/libllcp/libllcp.hash
similarity index 100%
rename from software/package/libllcp/libllcp.hash
rename to buildroot/package/libllcp/libllcp.hash
diff --git a/software/package/libllcp/libllcp.mk b/buildroot/package/libllcp/libllcp.mk
similarity index 100%
rename from software/package/libllcp/libllcp.mk
rename to buildroot/package/libllcp/libllcp.mk
diff --git a/software/package/liblo/Config.in b/buildroot/package/liblo/Config.in
similarity index 100%
rename from software/package/liblo/Config.in
rename to buildroot/package/liblo/Config.in
diff --git a/software/package/liblo/liblo.hash b/buildroot/package/liblo/liblo.hash
similarity index 100%
rename from software/package/liblo/liblo.hash
rename to buildroot/package/liblo/liblo.hash
diff --git a/software/package/liblo/liblo.mk b/buildroot/package/liblo/liblo.mk
similarity index 100%
rename from software/package/liblo/liblo.mk
rename to buildroot/package/liblo/liblo.mk
diff --git a/software/package/liblockfile/0001-install.patch b/buildroot/package/liblockfile/0001-install.patch
similarity index 100%
rename from software/package/liblockfile/0001-install.patch
rename to buildroot/package/liblockfile/0001-install.patch
diff --git a/software/package/liblockfile/Config.in b/buildroot/package/liblockfile/Config.in
similarity index 100%
rename from software/package/liblockfile/Config.in
rename to buildroot/package/liblockfile/Config.in
diff --git a/software/package/liblockfile/liblockfile.hash b/buildroot/package/liblockfile/liblockfile.hash
similarity index 100%
rename from software/package/liblockfile/liblockfile.hash
rename to buildroot/package/liblockfile/liblockfile.hash
diff --git a/software/package/liblockfile/liblockfile.mk b/buildroot/package/liblockfile/liblockfile.mk
similarity index 100%
rename from software/package/liblockfile/liblockfile.mk
rename to buildroot/package/liblockfile/liblockfile.mk
diff --git a/software/package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch b/buildroot/package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch
similarity index 100%
rename from software/package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch
rename to buildroot/package/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch
diff --git a/software/package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch b/buildroot/package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch
similarity index 100%
rename from software/package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch
rename to buildroot/package/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch
diff --git a/software/package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch b/buildroot/package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch
similarity index 100%
rename from software/package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch
rename to buildroot/package/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch
diff --git a/software/package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch b/buildroot/package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch
similarity index 100%
rename from software/package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch
rename to buildroot/package/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch
diff --git a/software/package/liblog4c-localtime/0005-Fix-C-support.patch b/buildroot/package/liblog4c-localtime/0005-Fix-C-support.patch
similarity index 100%
rename from software/package/liblog4c-localtime/0005-Fix-C-support.patch
rename to buildroot/package/liblog4c-localtime/0005-Fix-C-support.patch
diff --git a/software/package/liblog4c-localtime/Config.in b/buildroot/package/liblog4c-localtime/Config.in
similarity index 100%
rename from software/package/liblog4c-localtime/Config.in
rename to buildroot/package/liblog4c-localtime/Config.in
diff --git a/software/package/liblog4c-localtime/liblog4c-localtime.hash b/buildroot/package/liblog4c-localtime/liblog4c-localtime.hash
similarity index 100%
rename from software/package/liblog4c-localtime/liblog4c-localtime.hash
rename to buildroot/package/liblog4c-localtime/liblog4c-localtime.hash
diff --git a/software/package/liblog4c-localtime/liblog4c-localtime.mk b/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk
similarity index 100%
rename from software/package/liblog4c-localtime/liblog4c-localtime.mk
rename to buildroot/package/liblog4c-localtime/liblog4c-localtime.mk
diff --git a/software/package/liblogging/Config.in b/buildroot/package/liblogging/Config.in
similarity index 100%
rename from software/package/liblogging/Config.in
rename to buildroot/package/liblogging/Config.in
diff --git a/software/package/liblogging/liblogging.hash b/buildroot/package/liblogging/liblogging.hash
similarity index 100%
rename from software/package/liblogging/liblogging.hash
rename to buildroot/package/liblogging/liblogging.hash
diff --git a/software/package/liblogging/liblogging.mk b/buildroot/package/liblogging/liblogging.mk
similarity index 100%
rename from software/package/liblogging/liblogging.mk
rename to buildroot/package/liblogging/liblogging.mk
diff --git a/software/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch b/buildroot/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch
similarity index 100%
rename from software/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch
rename to buildroot/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch
diff --git a/software/package/libloki/0002-use-ln-snf.patch b/buildroot/package/libloki/0002-use-ln-snf.patch
similarity index 100%
rename from software/package/libloki/0002-use-ln-snf.patch
rename to buildroot/package/libloki/0002-use-ln-snf.patch
diff --git a/software/package/libloki/Config.in b/buildroot/package/libloki/Config.in
similarity index 100%
rename from software/package/libloki/Config.in
rename to buildroot/package/libloki/Config.in
diff --git a/software/package/libloki/libloki.hash b/buildroot/package/libloki/libloki.hash
similarity index 100%
rename from software/package/libloki/libloki.hash
rename to buildroot/package/libloki/libloki.hash
diff --git a/software/package/libloki/libloki.mk b/buildroot/package/libloki/libloki.mk
similarity index 100%
rename from software/package/libloki/libloki.mk
rename to buildroot/package/libloki/libloki.mk
diff --git a/software/package/libmad/0001-mips-h-constraint-removal.patch b/buildroot/package/libmad/0001-mips-h-constraint-removal.patch
similarity index 100%
rename from software/package/libmad/0001-mips-h-constraint-removal.patch
rename to buildroot/package/libmad/0001-mips-h-constraint-removal.patch
diff --git a/software/package/libmad/0002-configure-ac-automake-foreign.patch b/buildroot/package/libmad/0002-configure-ac-automake-foreign.patch
similarity index 100%
rename from software/package/libmad/0002-configure-ac-automake-foreign.patch
rename to buildroot/package/libmad/0002-configure-ac-automake-foreign.patch
diff --git a/software/package/libmad/Config.in b/buildroot/package/libmad/Config.in
similarity index 100%
rename from software/package/libmad/Config.in
rename to buildroot/package/libmad/Config.in
diff --git a/software/package/libmad/libmad.hash b/buildroot/package/libmad/libmad.hash
similarity index 100%
rename from software/package/libmad/libmad.hash
rename to buildroot/package/libmad/libmad.hash
diff --git a/software/package/libmad/libmad.mk b/buildroot/package/libmad/libmad.mk
similarity index 100%
rename from software/package/libmad/libmad.mk
rename to buildroot/package/libmad/libmad.mk
diff --git a/software/package/libmad/mad.pc b/buildroot/package/libmad/mad.pc
similarity index 100%
rename from software/package/libmad/mad.pc
rename to buildroot/package/libmad/mad.pc
diff --git a/software/package/libmatroska/Config.in b/buildroot/package/libmatroska/Config.in
similarity index 100%
rename from software/package/libmatroska/Config.in
rename to buildroot/package/libmatroska/Config.in
diff --git a/software/package/libmatroska/libmatroska.hash b/buildroot/package/libmatroska/libmatroska.hash
similarity index 100%
rename from software/package/libmatroska/libmatroska.hash
rename to buildroot/package/libmatroska/libmatroska.hash
diff --git a/software/package/libmatroska/libmatroska.mk b/buildroot/package/libmatroska/libmatroska.mk
similarity index 100%
rename from software/package/libmatroska/libmatroska.mk
rename to buildroot/package/libmatroska/libmatroska.mk
diff --git a/software/package/libmaxminddb/Config.in b/buildroot/package/libmaxminddb/Config.in
similarity index 100%
rename from software/package/libmaxminddb/Config.in
rename to buildroot/package/libmaxminddb/Config.in
diff --git a/software/package/libmaxminddb/libmaxminddb.hash b/buildroot/package/libmaxminddb/libmaxminddb.hash
similarity index 100%
rename from software/package/libmaxminddb/libmaxminddb.hash
rename to buildroot/package/libmaxminddb/libmaxminddb.hash
diff --git a/software/package/libmaxminddb/libmaxminddb.mk b/buildroot/package/libmaxminddb/libmaxminddb.mk
similarity index 100%
rename from software/package/libmaxminddb/libmaxminddb.mk
rename to buildroot/package/libmaxminddb/libmaxminddb.mk
diff --git a/software/package/libmbim/Config.in b/buildroot/package/libmbim/Config.in
similarity index 100%
rename from software/package/libmbim/Config.in
rename to buildroot/package/libmbim/Config.in
diff --git a/software/package/libmbim/libmbim.hash b/buildroot/package/libmbim/libmbim.hash
similarity index 100%
rename from software/package/libmbim/libmbim.hash
rename to buildroot/package/libmbim/libmbim.hash
diff --git a/software/package/libmbim/libmbim.mk b/buildroot/package/libmbim/libmbim.mk
similarity index 100%
rename from software/package/libmbim/libmbim.mk
rename to buildroot/package/libmbim/libmbim.mk
diff --git a/software/package/libmbus/Config.in b/buildroot/package/libmbus/Config.in
similarity index 100%
rename from software/package/libmbus/Config.in
rename to buildroot/package/libmbus/Config.in
diff --git a/software/package/libmbus/libmbus.hash b/buildroot/package/libmbus/libmbus.hash
similarity index 100%
rename from software/package/libmbus/libmbus.hash
rename to buildroot/package/libmbus/libmbus.hash
diff --git a/software/package/libmbus/libmbus.mk b/buildroot/package/libmbus/libmbus.mk
similarity index 100%
rename from software/package/libmbus/libmbus.mk
rename to buildroot/package/libmbus/libmbus.mk
diff --git a/software/package/libmcrypt/0001-nocxx.patch b/buildroot/package/libmcrypt/0001-nocxx.patch
similarity index 100%
rename from software/package/libmcrypt/0001-nocxx.patch
rename to buildroot/package/libmcrypt/0001-nocxx.patch
diff --git a/software/package/libmcrypt/Config.in b/buildroot/package/libmcrypt/Config.in
similarity index 100%
rename from software/package/libmcrypt/Config.in
rename to buildroot/package/libmcrypt/Config.in
diff --git a/software/package/libmcrypt/libmcrypt.hash b/buildroot/package/libmcrypt/libmcrypt.hash
similarity index 100%
rename from software/package/libmcrypt/libmcrypt.hash
rename to buildroot/package/libmcrypt/libmcrypt.hash
diff --git a/software/package/libmcrypt/libmcrypt.mk b/buildroot/package/libmcrypt/libmcrypt.mk
similarity index 100%
rename from software/package/libmcrypt/libmcrypt.mk
rename to buildroot/package/libmcrypt/libmcrypt.mk
diff --git a/software/package/libmediaart/Config.in b/buildroot/package/libmediaart/Config.in
similarity index 100%
rename from software/package/libmediaart/Config.in
rename to buildroot/package/libmediaart/Config.in
diff --git a/software/package/libmediaart/libmediaart.hash b/buildroot/package/libmediaart/libmediaart.hash
similarity index 100%
rename from software/package/libmediaart/libmediaart.hash
rename to buildroot/package/libmediaart/libmediaart.hash
diff --git a/software/package/libmediaart/libmediaart.mk b/buildroot/package/libmediaart/libmediaart.mk
similarity index 100%
rename from software/package/libmediaart/libmediaart.mk
rename to buildroot/package/libmediaart/libmediaart.mk
diff --git a/software/package/libmemcached/0001-disable-tests.patch b/buildroot/package/libmemcached/0001-disable-tests.patch
similarity index 100%
rename from software/package/libmemcached/0001-disable-tests.patch
rename to buildroot/package/libmemcached/0001-disable-tests.patch
diff --git a/software/package/libmemcached/0002-disable-sanitizer.patch b/buildroot/package/libmemcached/0002-disable-sanitizer.patch
similarity index 100%
rename from software/package/libmemcached/0002-disable-sanitizer.patch
rename to buildroot/package/libmemcached/0002-disable-sanitizer.patch
diff --git a/software/package/libmemcached/0003-move-ac_config_aux_dir.patch b/buildroot/package/libmemcached/0003-move-ac_config_aux_dir.patch
similarity index 100%
rename from software/package/libmemcached/0003-move-ac_config_aux_dir.patch
rename to buildroot/package/libmemcached/0003-move-ac_config_aux_dir.patch
diff --git a/software/package/libmemcached/0004-disable-doc-and-man.patch b/buildroot/package/libmemcached/0004-disable-doc-and-man.patch
similarity index 100%
rename from software/package/libmemcached/0004-disable-doc-and-man.patch
rename to buildroot/package/libmemcached/0004-disable-doc-and-man.patch
diff --git a/software/package/libmemcached/0005-fix-pointer-comparaison.patch b/buildroot/package/libmemcached/0005-fix-pointer-comparaison.patch
similarity index 100%
rename from software/package/libmemcached/0005-fix-pointer-comparaison.patch
rename to buildroot/package/libmemcached/0005-fix-pointer-comparaison.patch
diff --git a/software/package/libmemcached/Config.in b/buildroot/package/libmemcached/Config.in
similarity index 100%
rename from software/package/libmemcached/Config.in
rename to buildroot/package/libmemcached/Config.in
diff --git a/software/package/libmemcached/libmemcached.hash b/buildroot/package/libmemcached/libmemcached.hash
similarity index 100%
rename from software/package/libmemcached/libmemcached.hash
rename to buildroot/package/libmemcached/libmemcached.hash
diff --git a/software/package/libmemcached/libmemcached.mk b/buildroot/package/libmemcached/libmemcached.mk
similarity index 100%
rename from software/package/libmemcached/libmemcached.mk
rename to buildroot/package/libmemcached/libmemcached.mk
diff --git a/software/package/libmhash/Config.in b/buildroot/package/libmhash/Config.in
similarity index 100%
rename from software/package/libmhash/Config.in
rename to buildroot/package/libmhash/Config.in
diff --git a/software/package/libmhash/libmhash.hash b/buildroot/package/libmhash/libmhash.hash
similarity index 100%
rename from software/package/libmhash/libmhash.hash
rename to buildroot/package/libmhash/libmhash.hash
diff --git a/software/package/libmhash/libmhash.mk b/buildroot/package/libmhash/libmhash.mk
similarity index 100%
rename from software/package/libmhash/libmhash.mk
rename to buildroot/package/libmhash/libmhash.mk
diff --git a/software/package/libmicrohttpd/Config.in b/buildroot/package/libmicrohttpd/Config.in
similarity index 100%
rename from software/package/libmicrohttpd/Config.in
rename to buildroot/package/libmicrohttpd/Config.in
diff --git a/software/package/libmicrohttpd/libmicrohttpd.hash b/buildroot/package/libmicrohttpd/libmicrohttpd.hash
similarity index 100%
rename from software/package/libmicrohttpd/libmicrohttpd.hash
rename to buildroot/package/libmicrohttpd/libmicrohttpd.hash
diff --git a/software/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk
similarity index 100%
rename from software/package/libmicrohttpd/libmicrohttpd.mk
rename to buildroot/package/libmicrohttpd/libmicrohttpd.mk
diff --git a/software/package/libminiupnpc/Config.in b/buildroot/package/libminiupnpc/Config.in
similarity index 100%
rename from software/package/libminiupnpc/Config.in
rename to buildroot/package/libminiupnpc/Config.in
diff --git a/software/package/libminiupnpc/libminiupnpc.hash b/buildroot/package/libminiupnpc/libminiupnpc.hash
similarity index 100%
rename from software/package/libminiupnpc/libminiupnpc.hash
rename to buildroot/package/libminiupnpc/libminiupnpc.hash
diff --git a/software/package/libminiupnpc/libminiupnpc.mk b/buildroot/package/libminiupnpc/libminiupnpc.mk
similarity index 100%
rename from software/package/libminiupnpc/libminiupnpc.mk
rename to buildroot/package/libminiupnpc/libminiupnpc.mk
diff --git a/software/package/libmms/Config.in b/buildroot/package/libmms/Config.in
similarity index 100%
rename from software/package/libmms/Config.in
rename to buildroot/package/libmms/Config.in
diff --git a/software/package/libmms/libmms.hash b/buildroot/package/libmms/libmms.hash
similarity index 100%
rename from software/package/libmms/libmms.hash
rename to buildroot/package/libmms/libmms.hash
diff --git a/software/package/libmms/libmms.mk b/buildroot/package/libmms/libmms.mk
similarity index 100%
rename from software/package/libmms/libmms.mk
rename to buildroot/package/libmms/libmms.mk
diff --git a/software/package/libmng/0001-jpeg-9a.patch b/buildroot/package/libmng/0001-jpeg-9a.patch
similarity index 100%
rename from software/package/libmng/0001-jpeg-9a.patch
rename to buildroot/package/libmng/0001-jpeg-9a.patch
diff --git a/software/package/libmng/Config.in b/buildroot/package/libmng/Config.in
similarity index 100%
rename from software/package/libmng/Config.in
rename to buildroot/package/libmng/Config.in
diff --git a/software/package/libmng/libmng.hash b/buildroot/package/libmng/libmng.hash
similarity index 100%
rename from software/package/libmng/libmng.hash
rename to buildroot/package/libmng/libmng.hash
diff --git a/software/package/libmng/libmng.mk b/buildroot/package/libmng/libmng.mk
similarity index 100%
rename from software/package/libmng/libmng.mk
rename to buildroot/package/libmng/libmng.mk
diff --git a/software/package/libmnl/Config.in b/buildroot/package/libmnl/Config.in
similarity index 100%
rename from software/package/libmnl/Config.in
rename to buildroot/package/libmnl/Config.in
diff --git a/software/package/libmnl/libmnl.hash b/buildroot/package/libmnl/libmnl.hash
similarity index 100%
rename from software/package/libmnl/libmnl.hash
rename to buildroot/package/libmnl/libmnl.hash
diff --git a/software/package/libmnl/libmnl.mk b/buildroot/package/libmnl/libmnl.mk
similarity index 100%
rename from software/package/libmnl/libmnl.mk
rename to buildroot/package/libmnl/libmnl.mk
diff --git a/software/package/libmodbus/Config.in b/buildroot/package/libmodbus/Config.in
similarity index 100%
rename from software/package/libmodbus/Config.in
rename to buildroot/package/libmodbus/Config.in
diff --git a/software/package/libmodbus/libmodbus.hash b/buildroot/package/libmodbus/libmodbus.hash
similarity index 100%
rename from software/package/libmodbus/libmodbus.hash
rename to buildroot/package/libmodbus/libmodbus.hash
diff --git a/software/package/libmodbus/libmodbus.mk b/buildroot/package/libmodbus/libmodbus.mk
similarity index 100%
rename from software/package/libmodbus/libmodbus.mk
rename to buildroot/package/libmodbus/libmodbus.mk
diff --git a/software/package/libmodplug/Config.in b/buildroot/package/libmodplug/Config.in
similarity index 100%
rename from software/package/libmodplug/Config.in
rename to buildroot/package/libmodplug/Config.in
diff --git a/software/package/libmodplug/libmodplug.hash b/buildroot/package/libmodplug/libmodplug.hash
similarity index 100%
rename from software/package/libmodplug/libmodplug.hash
rename to buildroot/package/libmodplug/libmodplug.hash
diff --git a/software/package/libmodplug/libmodplug.mk b/buildroot/package/libmodplug/libmodplug.mk
similarity index 100%
rename from software/package/libmodplug/libmodplug.mk
rename to buildroot/package/libmodplug/libmodplug.mk
diff --git a/software/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch b/buildroot/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch
similarity index 100%
rename from software/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch
rename to buildroot/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch
diff --git a/software/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch b/buildroot/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch
similarity index 100%
rename from software/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch
rename to buildroot/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch
diff --git a/software/package/libmodsecurity/Config.in b/buildroot/package/libmodsecurity/Config.in
similarity index 100%
rename from software/package/libmodsecurity/Config.in
rename to buildroot/package/libmodsecurity/Config.in
diff --git a/software/package/libmodsecurity/libmodsecurity.hash b/buildroot/package/libmodsecurity/libmodsecurity.hash
similarity index 100%
rename from software/package/libmodsecurity/libmodsecurity.hash
rename to buildroot/package/libmodsecurity/libmodsecurity.hash
diff --git a/software/package/libmodsecurity/libmodsecurity.mk b/buildroot/package/libmodsecurity/libmodsecurity.mk
similarity index 100%
rename from software/package/libmodsecurity/libmodsecurity.mk
rename to buildroot/package/libmodsecurity/libmodsecurity.mk
diff --git a/software/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch b/buildroot/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch
similarity index 100%
rename from software/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch
rename to buildroot/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch
diff --git a/software/package/libmpd/Config.in b/buildroot/package/libmpd/Config.in
similarity index 100%
rename from software/package/libmpd/Config.in
rename to buildroot/package/libmpd/Config.in
diff --git a/software/package/libmpd/libmpd.hash b/buildroot/package/libmpd/libmpd.hash
similarity index 100%
rename from software/package/libmpd/libmpd.hash
rename to buildroot/package/libmpd/libmpd.hash
diff --git a/software/package/libmpd/libmpd.mk b/buildroot/package/libmpd/libmpd.mk
similarity index 100%
rename from software/package/libmpd/libmpd.mk
rename to buildroot/package/libmpd/libmpd.mk
diff --git a/software/package/libmpdclient/Config.in b/buildroot/package/libmpdclient/Config.in
similarity index 100%
rename from software/package/libmpdclient/Config.in
rename to buildroot/package/libmpdclient/Config.in
diff --git a/software/package/libmpdclient/libmpdclient.hash b/buildroot/package/libmpdclient/libmpdclient.hash
similarity index 100%
rename from software/package/libmpdclient/libmpdclient.hash
rename to buildroot/package/libmpdclient/libmpdclient.hash
diff --git a/software/package/libmpdclient/libmpdclient.mk b/buildroot/package/libmpdclient/libmpdclient.mk
similarity index 100%
rename from software/package/libmpdclient/libmpdclient.mk
rename to buildroot/package/libmpdclient/libmpdclient.mk
diff --git a/software/package/libmpeg2/0001-altivec.patch b/buildroot/package/libmpeg2/0001-altivec.patch
similarity index 100%
rename from software/package/libmpeg2/0001-altivec.patch
rename to buildroot/package/libmpeg2/0001-altivec.patch
diff --git a/software/package/libmpeg2/0002-armv4l.patch b/buildroot/package/libmpeg2/0002-armv4l.patch
similarity index 100%
rename from software/package/libmpeg2/0002-armv4l.patch
rename to buildroot/package/libmpeg2/0002-armv4l.patch
diff --git a/software/package/libmpeg2/0003-fix-arm-detection.patch b/buildroot/package/libmpeg2/0003-fix-arm-detection.patch
similarity index 100%
rename from software/package/libmpeg2/0003-fix-arm-detection.patch
rename to buildroot/package/libmpeg2/0003-fix-arm-detection.patch
diff --git a/software/package/libmpeg2/0004-fix-sparc.patch b/buildroot/package/libmpeg2/0004-fix-sparc.patch
similarity index 100%
rename from software/package/libmpeg2/0004-fix-sparc.patch
rename to buildroot/package/libmpeg2/0004-fix-sparc.patch
diff --git a/software/package/libmpeg2/Config.in b/buildroot/package/libmpeg2/Config.in
similarity index 100%
rename from software/package/libmpeg2/Config.in
rename to buildroot/package/libmpeg2/Config.in
diff --git a/software/package/libmpeg2/libmpeg2.hash b/buildroot/package/libmpeg2/libmpeg2.hash
similarity index 100%
rename from software/package/libmpeg2/libmpeg2.hash
rename to buildroot/package/libmpeg2/libmpeg2.hash
diff --git a/software/package/libmpeg2/libmpeg2.mk b/buildroot/package/libmpeg2/libmpeg2.mk
similarity index 100%
rename from software/package/libmpeg2/libmpeg2.mk
rename to buildroot/package/libmpeg2/libmpeg2.mk
diff --git a/software/package/libmspack/Config.in b/buildroot/package/libmspack/Config.in
similarity index 100%
rename from software/package/libmspack/Config.in
rename to buildroot/package/libmspack/Config.in
diff --git a/software/package/libmspack/libmspack.hash b/buildroot/package/libmspack/libmspack.hash
similarity index 100%
rename from software/package/libmspack/libmspack.hash
rename to buildroot/package/libmspack/libmspack.hash
diff --git a/software/package/libmspack/libmspack.mk b/buildroot/package/libmspack/libmspack.mk
similarity index 100%
rename from software/package/libmspack/libmspack.mk
rename to buildroot/package/libmspack/libmspack.mk
diff --git a/software/package/libnatpmp/Config.in b/buildroot/package/libnatpmp/Config.in
similarity index 100%
rename from software/package/libnatpmp/Config.in
rename to buildroot/package/libnatpmp/Config.in
diff --git a/software/package/libnatpmp/libnatpmp.hash b/buildroot/package/libnatpmp/libnatpmp.hash
similarity index 100%
rename from software/package/libnatpmp/libnatpmp.hash
rename to buildroot/package/libnatpmp/libnatpmp.hash
diff --git a/software/package/libnatpmp/libnatpmp.mk b/buildroot/package/libnatpmp/libnatpmp.mk
similarity index 100%
rename from software/package/libnatpmp/libnatpmp.mk
rename to buildroot/package/libnatpmp/libnatpmp.mk
diff --git a/software/package/libndp/0001-ndptool.c-Fix-musl-build.patch b/buildroot/package/libndp/0001-ndptool.c-Fix-musl-build.patch
similarity index 100%
rename from software/package/libndp/0001-ndptool.c-Fix-musl-build.patch
rename to buildroot/package/libndp/0001-ndptool.c-Fix-musl-build.patch
diff --git a/software/package/libndp/Config.in b/buildroot/package/libndp/Config.in
similarity index 100%
rename from software/package/libndp/Config.in
rename to buildroot/package/libndp/Config.in
diff --git a/software/package/libndp/libndp.hash b/buildroot/package/libndp/libndp.hash
similarity index 100%
rename from software/package/libndp/libndp.hash
rename to buildroot/package/libndp/libndp.hash
diff --git a/software/package/libndp/libndp.mk b/buildroot/package/libndp/libndp.mk
similarity index 100%
rename from software/package/libndp/libndp.mk
rename to buildroot/package/libndp/libndp.mk
diff --git a/software/package/libnet/0001-support-musl-libc.patch b/buildroot/package/libnet/0001-support-musl-libc.patch
similarity index 100%
rename from software/package/libnet/0001-support-musl-libc.patch
rename to buildroot/package/libnet/0001-support-musl-libc.patch
diff --git a/software/package/libnet/Config.in b/buildroot/package/libnet/Config.in
similarity index 100%
rename from software/package/libnet/Config.in
rename to buildroot/package/libnet/Config.in
diff --git a/software/package/libnet/libnet.hash b/buildroot/package/libnet/libnet.hash
similarity index 100%
rename from software/package/libnet/libnet.hash
rename to buildroot/package/libnet/libnet.hash
diff --git a/software/package/libnet/libnet.mk b/buildroot/package/libnet/libnet.mk
similarity index 100%
rename from software/package/libnet/libnet.mk
rename to buildroot/package/libnet/libnet.mk
diff --git a/software/package/libnetconf2/Config.in b/buildroot/package/libnetconf2/Config.in
similarity index 100%
rename from software/package/libnetconf2/Config.in
rename to buildroot/package/libnetconf2/Config.in
diff --git a/software/package/libnetconf2/libnetconf2.hash b/buildroot/package/libnetconf2/libnetconf2.hash
similarity index 100%
rename from software/package/libnetconf2/libnetconf2.hash
rename to buildroot/package/libnetconf2/libnetconf2.hash
diff --git a/software/package/libnetconf2/libnetconf2.mk b/buildroot/package/libnetconf2/libnetconf2.mk
similarity index 100%
rename from software/package/libnetconf2/libnetconf2.mk
rename to buildroot/package/libnetconf2/libnetconf2.mk
diff --git a/software/package/libnetfilter_acct/Config.in b/buildroot/package/libnetfilter_acct/Config.in
similarity index 100%
rename from software/package/libnetfilter_acct/Config.in
rename to buildroot/package/libnetfilter_acct/Config.in
diff --git a/software/package/libnetfilter_acct/libnetfilter_acct.hash b/buildroot/package/libnetfilter_acct/libnetfilter_acct.hash
similarity index 100%
rename from software/package/libnetfilter_acct/libnetfilter_acct.hash
rename to buildroot/package/libnetfilter_acct/libnetfilter_acct.hash
diff --git a/software/package/libnetfilter_acct/libnetfilter_acct.mk b/buildroot/package/libnetfilter_acct/libnetfilter_acct.mk
similarity index 100%
rename from software/package/libnetfilter_acct/libnetfilter_acct.mk
rename to buildroot/package/libnetfilter_acct/libnetfilter_acct.mk
diff --git a/software/package/libnetfilter_conntrack/Config.in b/buildroot/package/libnetfilter_conntrack/Config.in
similarity index 100%
rename from software/package/libnetfilter_conntrack/Config.in
rename to buildroot/package/libnetfilter_conntrack/Config.in
diff --git a/software/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.hash
similarity index 100%
rename from software/package/libnetfilter_conntrack/libnetfilter_conntrack.hash
rename to buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.hash
diff --git a/software/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
similarity index 100%
rename from software/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
rename to buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
diff --git a/software/package/libnetfilter_cthelper/0001-uclinux.patch b/buildroot/package/libnetfilter_cthelper/0001-uclinux.patch
similarity index 100%
rename from software/package/libnetfilter_cthelper/0001-uclinux.patch
rename to buildroot/package/libnetfilter_cthelper/0001-uclinux.patch
diff --git a/software/package/libnetfilter_cthelper/Config.in b/buildroot/package/libnetfilter_cthelper/Config.in
similarity index 100%
rename from software/package/libnetfilter_cthelper/Config.in
rename to buildroot/package/libnetfilter_cthelper/Config.in
diff --git a/software/package/libnetfilter_cthelper/libnetfilter_cthelper.hash b/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.hash
similarity index 100%
rename from software/package/libnetfilter_cthelper/libnetfilter_cthelper.hash
rename to buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.hash
diff --git a/software/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
similarity index 100%
rename from software/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
rename to buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
diff --git a/software/package/libnetfilter_cttimeout/0001-uclinux.patch b/buildroot/package/libnetfilter_cttimeout/0001-uclinux.patch
similarity index 100%
rename from software/package/libnetfilter_cttimeout/0001-uclinux.patch
rename to buildroot/package/libnetfilter_cttimeout/0001-uclinux.patch
diff --git a/software/package/libnetfilter_cttimeout/Config.in b/buildroot/package/libnetfilter_cttimeout/Config.in
similarity index 100%
rename from software/package/libnetfilter_cttimeout/Config.in
rename to buildroot/package/libnetfilter_cttimeout/Config.in
diff --git a/software/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash b/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash
similarity index 100%
rename from software/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash
rename to buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash
diff --git a/software/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
similarity index 100%
rename from software/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
rename to buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
diff --git a/software/package/libnetfilter_log/0001-uclinux.patch b/buildroot/package/libnetfilter_log/0001-uclinux.patch
similarity index 100%
rename from software/package/libnetfilter_log/0001-uclinux.patch
rename to buildroot/package/libnetfilter_log/0001-uclinux.patch
diff --git a/software/package/libnetfilter_log/Config.in b/buildroot/package/libnetfilter_log/Config.in
similarity index 100%
rename from software/package/libnetfilter_log/Config.in
rename to buildroot/package/libnetfilter_log/Config.in
diff --git a/software/package/libnetfilter_log/libnetfilter_log.hash b/buildroot/package/libnetfilter_log/libnetfilter_log.hash
similarity index 100%
rename from software/package/libnetfilter_log/libnetfilter_log.hash
rename to buildroot/package/libnetfilter_log/libnetfilter_log.hash
diff --git a/software/package/libnetfilter_log/libnetfilter_log.mk b/buildroot/package/libnetfilter_log/libnetfilter_log.mk
similarity index 100%
rename from software/package/libnetfilter_log/libnetfilter_log.mk
rename to buildroot/package/libnetfilter_log/libnetfilter_log.mk
diff --git a/software/package/libnetfilter_queue/Config.in b/buildroot/package/libnetfilter_queue/Config.in
similarity index 100%
rename from software/package/libnetfilter_queue/Config.in
rename to buildroot/package/libnetfilter_queue/Config.in
diff --git a/software/package/libnetfilter_queue/libnetfilter_queue.hash b/buildroot/package/libnetfilter_queue/libnetfilter_queue.hash
similarity index 100%
rename from software/package/libnetfilter_queue/libnetfilter_queue.hash
rename to buildroot/package/libnetfilter_queue/libnetfilter_queue.hash
diff --git a/software/package/libnetfilter_queue/libnetfilter_queue.mk b/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk
similarity index 100%
rename from software/package/libnetfilter_queue/libnetfilter_queue.mk
rename to buildroot/package/libnetfilter_queue/libnetfilter_queue.mk
diff --git a/software/package/libnfc/0001-build-systems-make-example-build-optional.patch b/buildroot/package/libnfc/0001-build-systems-make-example-build-optional.patch
similarity index 100%
rename from software/package/libnfc/0001-build-systems-make-example-build-optional.patch
rename to buildroot/package/libnfc/0001-build-systems-make-example-build-optional.patch
diff --git a/software/package/libnfc/Config.in b/buildroot/package/libnfc/Config.in
similarity index 100%
rename from software/package/libnfc/Config.in
rename to buildroot/package/libnfc/Config.in
diff --git a/software/package/libnfc/libnfc.hash b/buildroot/package/libnfc/libnfc.hash
similarity index 100%
rename from software/package/libnfc/libnfc.hash
rename to buildroot/package/libnfc/libnfc.hash
diff --git a/software/package/libnfc/libnfc.mk b/buildroot/package/libnfc/libnfc.mk
similarity index 100%
rename from software/package/libnfc/libnfc.mk
rename to buildroot/package/libnfc/libnfc.mk
diff --git a/software/package/libnfnetlink/0001-uclinux.patch b/buildroot/package/libnfnetlink/0001-uclinux.patch
similarity index 100%
rename from software/package/libnfnetlink/0001-uclinux.patch
rename to buildroot/package/libnfnetlink/0001-uclinux.patch
diff --git a/software/package/libnfnetlink/0002-musl.patch b/buildroot/package/libnfnetlink/0002-musl.patch
similarity index 100%
rename from software/package/libnfnetlink/0002-musl.patch
rename to buildroot/package/libnfnetlink/0002-musl.patch
diff --git a/software/package/libnfnetlink/Config.in b/buildroot/package/libnfnetlink/Config.in
similarity index 100%
rename from software/package/libnfnetlink/Config.in
rename to buildroot/package/libnfnetlink/Config.in
diff --git a/software/package/libnfnetlink/libnfnetlink.hash b/buildroot/package/libnfnetlink/libnfnetlink.hash
similarity index 100%
rename from software/package/libnfnetlink/libnfnetlink.hash
rename to buildroot/package/libnfnetlink/libnfnetlink.hash
diff --git a/software/package/libnfnetlink/libnfnetlink.mk b/buildroot/package/libnfnetlink/libnfnetlink.mk
similarity index 100%
rename from software/package/libnfnetlink/libnfnetlink.mk
rename to buildroot/package/libnfnetlink/libnfnetlink.mk
diff --git a/software/package/libnfs/0001-Fix-include-sys-time.h.patch b/buildroot/package/libnfs/0001-Fix-include-sys-time.h.patch
similarity index 100%
rename from software/package/libnfs/0001-Fix-include-sys-time.h.patch
rename to buildroot/package/libnfs/0001-Fix-include-sys-time.h.patch
diff --git a/software/package/libnfs/Config.in b/buildroot/package/libnfs/Config.in
similarity index 100%
rename from software/package/libnfs/Config.in
rename to buildroot/package/libnfs/Config.in
diff --git a/software/package/libnfs/libnfs.hash b/buildroot/package/libnfs/libnfs.hash
similarity index 100%
rename from software/package/libnfs/libnfs.hash
rename to buildroot/package/libnfs/libnfs.hash
diff --git a/software/package/libnfs/libnfs.mk b/buildroot/package/libnfs/libnfs.mk
similarity index 100%
rename from software/package/libnfs/libnfs.mk
rename to buildroot/package/libnfs/libnfs.mk
diff --git a/software/package/libnftnl/Config.in b/buildroot/package/libnftnl/Config.in
similarity index 100%
rename from software/package/libnftnl/Config.in
rename to buildroot/package/libnftnl/Config.in
diff --git a/software/package/libnftnl/libnftnl.hash b/buildroot/package/libnftnl/libnftnl.hash
similarity index 100%
rename from software/package/libnftnl/libnftnl.hash
rename to buildroot/package/libnftnl/libnftnl.hash
diff --git a/software/package/libnftnl/libnftnl.mk b/buildroot/package/libnftnl/libnftnl.mk
similarity index 100%
rename from software/package/libnftnl/libnftnl.mk
rename to buildroot/package/libnftnl/libnftnl.mk
diff --git a/software/package/libnice/Config.in b/buildroot/package/libnice/Config.in
similarity index 100%
rename from software/package/libnice/Config.in
rename to buildroot/package/libnice/Config.in
diff --git a/software/package/libnice/libnice.hash b/buildroot/package/libnice/libnice.hash
similarity index 100%
rename from software/package/libnice/libnice.hash
rename to buildroot/package/libnice/libnice.hash
diff --git a/software/package/libnice/libnice.mk b/buildroot/package/libnice/libnice.mk
similarity index 100%
rename from software/package/libnice/libnice.mk
rename to buildroot/package/libnice/libnice.mk
diff --git a/software/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch b/buildroot/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
similarity index 100%
rename from software/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
rename to buildroot/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
diff --git a/software/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/buildroot/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
similarity index 100%
rename from software/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
rename to buildroot/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
diff --git a/software/package/libnl/Config.in b/buildroot/package/libnl/Config.in
similarity index 100%
rename from software/package/libnl/Config.in
rename to buildroot/package/libnl/Config.in
diff --git a/software/package/libnl/libnl.hash b/buildroot/package/libnl/libnl.hash
similarity index 100%
rename from software/package/libnl/libnl.hash
rename to buildroot/package/libnl/libnl.hash
diff --git a/software/package/libnl/libnl.mk b/buildroot/package/libnl/libnl.mk
similarity index 100%
rename from software/package/libnl/libnl.mk
rename to buildroot/package/libnl/libnl.mk
diff --git a/software/package/libnpth/Config.in b/buildroot/package/libnpth/Config.in
similarity index 100%
rename from software/package/libnpth/Config.in
rename to buildroot/package/libnpth/Config.in
diff --git a/software/package/libnpth/libnpth.hash b/buildroot/package/libnpth/libnpth.hash
similarity index 100%
rename from software/package/libnpth/libnpth.hash
rename to buildroot/package/libnpth/libnpth.hash
diff --git a/software/package/libnpth/libnpth.mk b/buildroot/package/libnpth/libnpth.mk
similarity index 100%
rename from software/package/libnpth/libnpth.mk
rename to buildroot/package/libnpth/libnpth.mk
diff --git a/software/package/libnspr/Config.in b/buildroot/package/libnspr/Config.in
similarity index 100%
rename from software/package/libnspr/Config.in
rename to buildroot/package/libnspr/Config.in
diff --git a/software/package/libnspr/libnspr.hash b/buildroot/package/libnspr/libnspr.hash
similarity index 100%
rename from software/package/libnspr/libnspr.hash
rename to buildroot/package/libnspr/libnspr.hash
diff --git a/software/package/libnspr/libnspr.mk b/buildroot/package/libnspr/libnspr.mk
similarity index 100%
rename from software/package/libnspr/libnspr.mk
rename to buildroot/package/libnspr/libnspr.mk
diff --git a/software/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch b/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
similarity index 100%
rename from software/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
rename to buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
diff --git a/software/package/libnss/Config.in b/buildroot/package/libnss/Config.in
similarity index 100%
rename from software/package/libnss/Config.in
rename to buildroot/package/libnss/Config.in
diff --git a/software/package/libnss/libnss.hash b/buildroot/package/libnss/libnss.hash
similarity index 100%
rename from software/package/libnss/libnss.hash
rename to buildroot/package/libnss/libnss.hash
diff --git a/software/package/libnss/libnss.mk b/buildroot/package/libnss/libnss.mk
similarity index 100%
rename from software/package/libnss/libnss.mk
rename to buildroot/package/libnss/libnss.mk
diff --git a/software/package/libnss/nss.pc.in b/buildroot/package/libnss/nss.pc.in
similarity index 100%
rename from software/package/libnss/nss.pc.in
rename to buildroot/package/libnss/nss.pc.in
diff --git a/software/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch b/buildroot/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch
similarity index 100%
rename from software/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch
rename to buildroot/package/liboauth/0001-Fixes-build-issue-with-OpenSSL-1.1.0.patch
diff --git a/software/package/liboauth/Config.in b/buildroot/package/liboauth/Config.in
similarity index 100%
rename from software/package/liboauth/Config.in
rename to buildroot/package/liboauth/Config.in
diff --git a/software/package/liboauth/liboauth.hash b/buildroot/package/liboauth/liboauth.hash
similarity index 100%
rename from software/package/liboauth/liboauth.hash
rename to buildroot/package/liboauth/liboauth.hash
diff --git a/software/package/liboauth/liboauth.mk b/buildroot/package/liboauth/liboauth.mk
similarity index 100%
rename from software/package/liboauth/liboauth.mk
rename to buildroot/package/liboauth/liboauth.mk
diff --git a/software/package/libogg/Config.in b/buildroot/package/libogg/Config.in
similarity index 100%
rename from software/package/libogg/Config.in
rename to buildroot/package/libogg/Config.in
diff --git a/software/package/libogg/libogg.hash b/buildroot/package/libogg/libogg.hash
similarity index 100%
rename from software/package/libogg/libogg.hash
rename to buildroot/package/libogg/libogg.hash
diff --git a/software/package/libogg/libogg.mk b/buildroot/package/libogg/libogg.mk
similarity index 100%
rename from software/package/libogg/libogg.mk
rename to buildroot/package/libogg/libogg.mk
diff --git a/software/package/libolm/Config.in b/buildroot/package/libolm/Config.in
similarity index 100%
rename from software/package/libolm/Config.in
rename to buildroot/package/libolm/Config.in
diff --git a/software/package/libolm/libolm.hash b/buildroot/package/libolm/libolm.hash
similarity index 100%
rename from software/package/libolm/libolm.hash
rename to buildroot/package/libolm/libolm.hash
diff --git a/software/package/libolm/libolm.mk b/buildroot/package/libolm/libolm.mk
similarity index 100%
rename from software/package/libolm/libolm.mk
rename to buildroot/package/libolm/libolm.mk
diff --git a/software/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch b/buildroot/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch
similarity index 100%
rename from software/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch
rename to buildroot/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch
diff --git a/software/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch b/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch
similarity index 100%
rename from software/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch
rename to buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch
diff --git a/software/package/libopenh264/Config.in b/buildroot/package/libopenh264/Config.in
similarity index 100%
rename from software/package/libopenh264/Config.in
rename to buildroot/package/libopenh264/Config.in
diff --git a/software/package/libopenh264/libopenh264.hash b/buildroot/package/libopenh264/libopenh264.hash
similarity index 100%
rename from software/package/libopenh264/libopenh264.hash
rename to buildroot/package/libopenh264/libopenh264.hash
diff --git a/software/package/libopenh264/libopenh264.mk b/buildroot/package/libopenh264/libopenh264.mk
similarity index 100%
rename from software/package/libopenh264/libopenh264.mk
rename to buildroot/package/libopenh264/libopenh264.mk
diff --git a/software/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
similarity index 100%
rename from software/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
rename to buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
diff --git a/software/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch b/buildroot/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch
similarity index 100%
rename from software/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch
rename to buildroot/package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch
diff --git a/software/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/buildroot/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch
similarity index 100%
rename from software/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch
rename to buildroot/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch
diff --git a/software/package/libopenssl/Config.in b/buildroot/package/libopenssl/Config.in
similarity index 100%
rename from software/package/libopenssl/Config.in
rename to buildroot/package/libopenssl/Config.in
diff --git a/software/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash
similarity index 100%
rename from software/package/libopenssl/libopenssl.hash
rename to buildroot/package/libopenssl/libopenssl.hash
diff --git a/software/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk
similarity index 100%
rename from software/package/libopenssl/libopenssl.mk
rename to buildroot/package/libopenssl/libopenssl.mk
diff --git a/software/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch b/buildroot/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch
similarity index 100%
rename from software/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch
rename to buildroot/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch
diff --git a/software/package/liboping/Config.in b/buildroot/package/liboping/Config.in
similarity index 100%
rename from software/package/liboping/Config.in
rename to buildroot/package/liboping/Config.in
diff --git a/software/package/liboping/liboping.hash b/buildroot/package/liboping/liboping.hash
similarity index 100%
rename from software/package/liboping/liboping.hash
rename to buildroot/package/liboping/liboping.hash
diff --git a/software/package/liboping/liboping.mk b/buildroot/package/liboping/liboping.mk
similarity index 100%
rename from software/package/liboping/liboping.mk
rename to buildroot/package/liboping/liboping.mk
diff --git a/software/package/libopusenc/Config.in b/buildroot/package/libopusenc/Config.in
similarity index 100%
rename from software/package/libopusenc/Config.in
rename to buildroot/package/libopusenc/Config.in
diff --git a/software/package/libopusenc/libopusenc.hash b/buildroot/package/libopusenc/libopusenc.hash
similarity index 100%
rename from software/package/libopusenc/libopusenc.hash
rename to buildroot/package/libopusenc/libopusenc.hash
diff --git a/software/package/libopusenc/libopusenc.mk b/buildroot/package/libopusenc/libopusenc.mk
similarity index 100%
rename from software/package/libopusenc/libopusenc.mk
rename to buildroot/package/libopusenc/libopusenc.mk
diff --git a/software/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch b/buildroot/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
similarity index 100%
rename from software/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
rename to buildroot/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
diff --git a/software/package/libosip2/Config.in b/buildroot/package/libosip2/Config.in
similarity index 100%
rename from software/package/libosip2/Config.in
rename to buildroot/package/libosip2/Config.in
diff --git a/software/package/libosip2/libosip2.hash b/buildroot/package/libosip2/libosip2.hash
similarity index 100%
rename from software/package/libosip2/libosip2.hash
rename to buildroot/package/libosip2/libosip2.hash
diff --git a/software/package/libosip2/libosip2.mk b/buildroot/package/libosip2/libosip2.mk
similarity index 100%
rename from software/package/libosip2/libosip2.mk
rename to buildroot/package/libosip2/libosip2.mk
diff --git a/software/package/libostree/Config.in b/buildroot/package/libostree/Config.in
similarity index 100%
rename from software/package/libostree/Config.in
rename to buildroot/package/libostree/Config.in
diff --git a/software/package/libostree/libostree.hash b/buildroot/package/libostree/libostree.hash
similarity index 100%
rename from software/package/libostree/libostree.hash
rename to buildroot/package/libostree/libostree.hash
diff --git a/software/package/libostree/libostree.mk b/buildroot/package/libostree/libostree.mk
similarity index 100%
rename from software/package/libostree/libostree.mk
rename to buildroot/package/libostree/libostree.mk
diff --git a/software/package/libp11/Config.in b/buildroot/package/libp11/Config.in
similarity index 100%
rename from software/package/libp11/Config.in
rename to buildroot/package/libp11/Config.in
diff --git a/software/package/libp11/Config.in.host b/buildroot/package/libp11/Config.in.host
similarity index 100%
rename from software/package/libp11/Config.in.host
rename to buildroot/package/libp11/Config.in.host
diff --git a/software/package/libp11/libp11.hash b/buildroot/package/libp11/libp11.hash
similarity index 100%
rename from software/package/libp11/libp11.hash
rename to buildroot/package/libp11/libp11.hash
diff --git a/software/package/libp11/libp11.mk b/buildroot/package/libp11/libp11.mk
similarity index 100%
rename from software/package/libp11/libp11.mk
rename to buildroot/package/libp11/libp11.mk
diff --git a/software/package/libpagekite/Config.in b/buildroot/package/libpagekite/Config.in
similarity index 100%
rename from software/package/libpagekite/Config.in
rename to buildroot/package/libpagekite/Config.in
diff --git a/software/package/libpagekite/libpagekite.hash b/buildroot/package/libpagekite/libpagekite.hash
similarity index 100%
rename from software/package/libpagekite/libpagekite.hash
rename to buildroot/package/libpagekite/libpagekite.hash
diff --git a/software/package/libpagekite/libpagekite.mk b/buildroot/package/libpagekite/libpagekite.mk
similarity index 100%
rename from software/package/libpagekite/libpagekite.mk
rename to buildroot/package/libpagekite/libpagekite.mk
diff --git a/software/package/libpam-nfc/Config.in b/buildroot/package/libpam-nfc/Config.in
similarity index 100%
rename from software/package/libpam-nfc/Config.in
rename to buildroot/package/libpam-nfc/Config.in
diff --git a/software/package/libpam-nfc/libpam-nfc.hash b/buildroot/package/libpam-nfc/libpam-nfc.hash
similarity index 100%
rename from software/package/libpam-nfc/libpam-nfc.hash
rename to buildroot/package/libpam-nfc/libpam-nfc.hash
diff --git a/software/package/libpam-nfc/libpam-nfc.mk b/buildroot/package/libpam-nfc/libpam-nfc.mk
similarity index 100%
rename from software/package/libpam-nfc/libpam-nfc.mk
rename to buildroot/package/libpam-nfc/libpam-nfc.mk
diff --git a/software/package/libpam-radius-auth/Config.in b/buildroot/package/libpam-radius-auth/Config.in
similarity index 100%
rename from software/package/libpam-radius-auth/Config.in
rename to buildroot/package/libpam-radius-auth/Config.in
diff --git a/software/package/libpam-radius-auth/libpam-radius-auth.hash b/buildroot/package/libpam-radius-auth/libpam-radius-auth.hash
similarity index 100%
rename from software/package/libpam-radius-auth/libpam-radius-auth.hash
rename to buildroot/package/libpam-radius-auth/libpam-radius-auth.hash
diff --git a/software/package/libpam-radius-auth/libpam-radius-auth.mk b/buildroot/package/libpam-radius-auth/libpam-radius-auth.mk
similarity index 100%
rename from software/package/libpam-radius-auth/libpam-radius-auth.mk
rename to buildroot/package/libpam-radius-auth/libpam-radius-auth.mk
diff --git a/software/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch b/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch
similarity index 100%
rename from software/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch
rename to buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch
diff --git a/software/package/libpam-tacplus/Config.in b/buildroot/package/libpam-tacplus/Config.in
similarity index 100%
rename from software/package/libpam-tacplus/Config.in
rename to buildroot/package/libpam-tacplus/Config.in
diff --git a/software/package/libpam-tacplus/libpam-tacplus.hash b/buildroot/package/libpam-tacplus/libpam-tacplus.hash
similarity index 100%
rename from software/package/libpam-tacplus/libpam-tacplus.hash
rename to buildroot/package/libpam-tacplus/libpam-tacplus.hash
diff --git a/software/package/libpam-tacplus/libpam-tacplus.mk b/buildroot/package/libpam-tacplus/libpam-tacplus.mk
similarity index 100%
rename from software/package/libpam-tacplus/libpam-tacplus.mk
rename to buildroot/package/libpam-tacplus/libpam-tacplus.mk
diff --git a/software/package/libpcap/Config.in b/buildroot/package/libpcap/Config.in
similarity index 100%
rename from software/package/libpcap/Config.in
rename to buildroot/package/libpcap/Config.in
diff --git a/software/package/libpcap/libpcap.hash b/buildroot/package/libpcap/libpcap.hash
similarity index 100%
rename from software/package/libpcap/libpcap.hash
rename to buildroot/package/libpcap/libpcap.hash
diff --git a/software/package/libpcap/libpcap.mk b/buildroot/package/libpcap/libpcap.mk
similarity index 100%
rename from software/package/libpcap/libpcap.mk
rename to buildroot/package/libpcap/libpcap.mk
diff --git a/software/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch b/buildroot/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch
similarity index 100%
rename from software/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch
rename to buildroot/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch
diff --git a/software/package/libpciaccess/Config.in b/buildroot/package/libpciaccess/Config.in
similarity index 100%
rename from software/package/libpciaccess/Config.in
rename to buildroot/package/libpciaccess/Config.in
diff --git a/software/package/libpciaccess/libpciaccess.hash b/buildroot/package/libpciaccess/libpciaccess.hash
similarity index 100%
rename from software/package/libpciaccess/libpciaccess.hash
rename to buildroot/package/libpciaccess/libpciaccess.hash
diff --git a/software/package/libpciaccess/libpciaccess.mk b/buildroot/package/libpciaccess/libpciaccess.mk
similarity index 100%
rename from software/package/libpciaccess/libpciaccess.mk
rename to buildroot/package/libpciaccess/libpciaccess.mk
diff --git a/software/package/libpfm4/Config.in b/buildroot/package/libpfm4/Config.in
similarity index 100%
rename from software/package/libpfm4/Config.in
rename to buildroot/package/libpfm4/Config.in
diff --git a/software/package/libpfm4/libpfm4.hash b/buildroot/package/libpfm4/libpfm4.hash
similarity index 100%
rename from software/package/libpfm4/libpfm4.hash
rename to buildroot/package/libpfm4/libpfm4.hash
diff --git a/software/package/libpfm4/libpfm4.mk b/buildroot/package/libpfm4/libpfm4.mk
similarity index 100%
rename from software/package/libpfm4/libpfm4.mk
rename to buildroot/package/libpfm4/libpfm4.mk
diff --git a/software/package/libphidget/Config.in b/buildroot/package/libphidget/Config.in
similarity index 100%
rename from software/package/libphidget/Config.in
rename to buildroot/package/libphidget/Config.in
diff --git a/software/package/libphidget/libphidget.hash b/buildroot/package/libphidget/libphidget.hash
similarity index 100%
rename from software/package/libphidget/libphidget.hash
rename to buildroot/package/libphidget/libphidget.hash
diff --git a/software/package/libphidget/libphidget.mk b/buildroot/package/libphidget/libphidget.mk
similarity index 100%
rename from software/package/libphidget/libphidget.mk
rename to buildroot/package/libphidget/libphidget.mk
diff --git a/software/package/libpjsip/Config.in b/buildroot/package/libpjsip/Config.in
similarity index 100%
rename from software/package/libpjsip/Config.in
rename to buildroot/package/libpjsip/Config.in
diff --git a/software/package/libpjsip/libpjsip.hash b/buildroot/package/libpjsip/libpjsip.hash
similarity index 100%
rename from software/package/libpjsip/libpjsip.hash
rename to buildroot/package/libpjsip/libpjsip.hash
diff --git a/software/package/libpjsip/libpjsip.mk b/buildroot/package/libpjsip/libpjsip.mk
similarity index 100%
rename from software/package/libpjsip/libpjsip.mk
rename to buildroot/package/libpjsip/libpjsip.mk
diff --git a/software/package/libplatform/Config.in b/buildroot/package/libplatform/Config.in
similarity index 100%
rename from software/package/libplatform/Config.in
rename to buildroot/package/libplatform/Config.in
diff --git a/software/package/libplatform/libplatform.hash b/buildroot/package/libplatform/libplatform.hash
similarity index 100%
rename from software/package/libplatform/libplatform.hash
rename to buildroot/package/libplatform/libplatform.hash
diff --git a/software/package/libplatform/libplatform.mk b/buildroot/package/libplatform/libplatform.mk
similarity index 100%
rename from software/package/libplatform/libplatform.mk
rename to buildroot/package/libplatform/libplatform.mk
diff --git a/software/package/libplist/Config.in b/buildroot/package/libplist/Config.in
similarity index 100%
rename from software/package/libplist/Config.in
rename to buildroot/package/libplist/Config.in
diff --git a/software/package/libplist/libplist.hash b/buildroot/package/libplist/libplist.hash
similarity index 100%
rename from software/package/libplist/libplist.hash
rename to buildroot/package/libplist/libplist.hash
diff --git a/software/package/libplist/libplist.mk b/buildroot/package/libplist/libplist.mk
similarity index 100%
rename from software/package/libplist/libplist.mk
rename to buildroot/package/libplist/libplist.mk
diff --git a/software/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/buildroot/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch
similarity index 100%
rename from software/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch
rename to buildroot/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch
diff --git a/software/package/libpng/Config.in b/buildroot/package/libpng/Config.in
similarity index 100%
rename from software/package/libpng/Config.in
rename to buildroot/package/libpng/Config.in
diff --git a/software/package/libpng/libpng.hash b/buildroot/package/libpng/libpng.hash
similarity index 100%
rename from software/package/libpng/libpng.hash
rename to buildroot/package/libpng/libpng.hash
diff --git a/software/package/libpng/libpng.mk b/buildroot/package/libpng/libpng.mk
similarity index 100%
rename from software/package/libpng/libpng.mk
rename to buildroot/package/libpng/libpng.mk
diff --git a/software/package/libpqxx/Config.in b/buildroot/package/libpqxx/Config.in
similarity index 100%
rename from software/package/libpqxx/Config.in
rename to buildroot/package/libpqxx/Config.in
diff --git a/software/package/libpqxx/libpqxx.hash b/buildroot/package/libpqxx/libpqxx.hash
similarity index 100%
rename from software/package/libpqxx/libpqxx.hash
rename to buildroot/package/libpqxx/libpqxx.hash
diff --git a/software/package/libpqxx/libpqxx.mk b/buildroot/package/libpqxx/libpqxx.mk
similarity index 100%
rename from software/package/libpqxx/libpqxx.mk
rename to buildroot/package/libpqxx/libpqxx.mk
diff --git a/software/package/libpri/Config.in b/buildroot/package/libpri/Config.in
similarity index 100%
rename from software/package/libpri/Config.in
rename to buildroot/package/libpri/Config.in
diff --git a/software/package/libpri/libpri.hash b/buildroot/package/libpri/libpri.hash
similarity index 100%
rename from software/package/libpri/libpri.hash
rename to buildroot/package/libpri/libpri.hash
diff --git a/software/package/libpri/libpri.mk b/buildroot/package/libpri/libpri.mk
similarity index 100%
rename from software/package/libpri/libpri.mk
rename to buildroot/package/libpri/libpri.mk
diff --git a/software/package/libpthread-stubs/Config.in b/buildroot/package/libpthread-stubs/Config.in
similarity index 100%
rename from software/package/libpthread-stubs/Config.in
rename to buildroot/package/libpthread-stubs/Config.in
diff --git a/software/package/libpthread-stubs/libpthread-stubs.hash b/buildroot/package/libpthread-stubs/libpthread-stubs.hash
similarity index 100%
rename from software/package/libpthread-stubs/libpthread-stubs.hash
rename to buildroot/package/libpthread-stubs/libpthread-stubs.hash
diff --git a/software/package/libpthread-stubs/libpthread-stubs.mk b/buildroot/package/libpthread-stubs/libpthread-stubs.mk
similarity index 100%
rename from software/package/libpthread-stubs/libpthread-stubs.mk
rename to buildroot/package/libpthread-stubs/libpthread-stubs.mk
diff --git a/software/package/libpthsem/0001-fix-build-on-linux-3.x-host.patch b/buildroot/package/libpthsem/0001-fix-build-on-linux-3.x-host.patch
similarity index 100%
rename from software/package/libpthsem/0001-fix-build-on-linux-3.x-host.patch
rename to buildroot/package/libpthsem/0001-fix-build-on-linux-3.x-host.patch
diff --git a/software/package/libpthsem/Config.in b/buildroot/package/libpthsem/Config.in
similarity index 100%
rename from software/package/libpthsem/Config.in
rename to buildroot/package/libpthsem/Config.in
diff --git a/software/package/libpthsem/libpthsem.hash b/buildroot/package/libpthsem/libpthsem.hash
similarity index 100%
rename from software/package/libpthsem/libpthsem.hash
rename to buildroot/package/libpthsem/libpthsem.hash
diff --git a/software/package/libpthsem/libpthsem.mk b/buildroot/package/libpthsem/libpthsem.mk
similarity index 100%
rename from software/package/libpthsem/libpthsem.mk
rename to buildroot/package/libpthsem/libpthsem.mk
diff --git a/software/package/libpwquality/Config.in b/buildroot/package/libpwquality/Config.in
similarity index 100%
rename from software/package/libpwquality/Config.in
rename to buildroot/package/libpwquality/Config.in
diff --git a/software/package/libpwquality/libpwquality.hash b/buildroot/package/libpwquality/libpwquality.hash
similarity index 100%
rename from software/package/libpwquality/libpwquality.hash
rename to buildroot/package/libpwquality/libpwquality.hash
diff --git a/software/package/libpwquality/libpwquality.mk b/buildroot/package/libpwquality/libpwquality.mk
similarity index 100%
rename from software/package/libpwquality/libpwquality.mk
rename to buildroot/package/libpwquality/libpwquality.mk
diff --git a/software/package/libqmi/Config.in b/buildroot/package/libqmi/Config.in
similarity index 100%
rename from software/package/libqmi/Config.in
rename to buildroot/package/libqmi/Config.in
diff --git a/software/package/libqmi/libqmi.hash b/buildroot/package/libqmi/libqmi.hash
similarity index 100%
rename from software/package/libqmi/libqmi.hash
rename to buildroot/package/libqmi/libqmi.hash
diff --git a/software/package/libqmi/libqmi.mk b/buildroot/package/libqmi/libqmi.mk
similarity index 100%
rename from software/package/libqmi/libqmi.mk
rename to buildroot/package/libqmi/libqmi.mk
diff --git a/software/package/libqrencode/Config.in b/buildroot/package/libqrencode/Config.in
similarity index 100%
rename from software/package/libqrencode/Config.in
rename to buildroot/package/libqrencode/Config.in
diff --git a/software/package/libqrencode/libqrencode.hash b/buildroot/package/libqrencode/libqrencode.hash
similarity index 100%
rename from software/package/libqrencode/libqrencode.hash
rename to buildroot/package/libqrencode/libqrencode.hash
diff --git a/software/package/libqrencode/libqrencode.mk b/buildroot/package/libqrencode/libqrencode.mk
similarity index 100%
rename from software/package/libqrencode/libqrencode.mk
rename to buildroot/package/libqrencode/libqrencode.mk
diff --git a/software/package/libraw/Config.in b/buildroot/package/libraw/Config.in
similarity index 100%
rename from software/package/libraw/Config.in
rename to buildroot/package/libraw/Config.in
diff --git a/software/package/libraw/libraw.hash b/buildroot/package/libraw/libraw.hash
similarity index 100%
rename from software/package/libraw/libraw.hash
rename to buildroot/package/libraw/libraw.hash
diff --git a/software/package/libraw/libraw.mk b/buildroot/package/libraw/libraw.mk
similarity index 100%
rename from software/package/libraw/libraw.mk
rename to buildroot/package/libraw/libraw.mk
diff --git a/software/package/libraw1394/Config.in b/buildroot/package/libraw1394/Config.in
similarity index 100%
rename from software/package/libraw1394/Config.in
rename to buildroot/package/libraw1394/Config.in
diff --git a/software/package/libraw1394/libraw1394.hash b/buildroot/package/libraw1394/libraw1394.hash
similarity index 100%
rename from software/package/libraw1394/libraw1394.hash
rename to buildroot/package/libraw1394/libraw1394.hash
diff --git a/software/package/libraw1394/libraw1394.mk b/buildroot/package/libraw1394/libraw1394.mk
similarity index 100%
rename from software/package/libraw1394/libraw1394.mk
rename to buildroot/package/libraw1394/libraw1394.mk
diff --git a/software/package/libreplaygain/Config.in b/buildroot/package/libreplaygain/Config.in
similarity index 100%
rename from software/package/libreplaygain/Config.in
rename to buildroot/package/libreplaygain/Config.in
diff --git a/software/package/libreplaygain/libreplaygain.hash b/buildroot/package/libreplaygain/libreplaygain.hash
similarity index 100%
rename from software/package/libreplaygain/libreplaygain.hash
rename to buildroot/package/libreplaygain/libreplaygain.hash
diff --git a/software/package/libreplaygain/libreplaygain.mk b/buildroot/package/libreplaygain/libreplaygain.mk
similarity index 100%
rename from software/package/libreplaygain/libreplaygain.mk
rename to buildroot/package/libreplaygain/libreplaygain.mk
diff --git a/software/package/libressl/Config.in b/buildroot/package/libressl/Config.in
similarity index 100%
rename from software/package/libressl/Config.in
rename to buildroot/package/libressl/Config.in
diff --git a/software/package/libressl/libressl.hash b/buildroot/package/libressl/libressl.hash
similarity index 100%
rename from software/package/libressl/libressl.hash
rename to buildroot/package/libressl/libressl.hash
diff --git a/software/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk
similarity index 100%
rename from software/package/libressl/libressl.mk
rename to buildroot/package/libressl/libressl.mk
diff --git a/software/package/libroxml/Config.in b/buildroot/package/libroxml/Config.in
similarity index 100%
rename from software/package/libroxml/Config.in
rename to buildroot/package/libroxml/Config.in
diff --git a/software/package/libroxml/libroxml.hash b/buildroot/package/libroxml/libroxml.hash
similarity index 100%
rename from software/package/libroxml/libroxml.hash
rename to buildroot/package/libroxml/libroxml.hash
diff --git a/software/package/libroxml/libroxml.mk b/buildroot/package/libroxml/libroxml.mk
similarity index 100%
rename from software/package/libroxml/libroxml.mk
rename to buildroot/package/libroxml/libroxml.mk
diff --git a/software/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch b/buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch
similarity index 100%
rename from software/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch
rename to buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch
diff --git a/software/package/librsvg/Config.in b/buildroot/package/librsvg/Config.in
similarity index 100%
rename from software/package/librsvg/Config.in
rename to buildroot/package/librsvg/Config.in
diff --git a/software/package/librsvg/librsvg.hash b/buildroot/package/librsvg/librsvg.hash
similarity index 100%
rename from software/package/librsvg/librsvg.hash
rename to buildroot/package/librsvg/librsvg.hash
diff --git a/software/package/librsvg/librsvg.mk b/buildroot/package/librsvg/librsvg.mk
similarity index 100%
rename from software/package/librsvg/librsvg.mk
rename to buildroot/package/librsvg/librsvg.mk
diff --git a/software/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch b/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch
similarity index 100%
rename from software/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch
rename to buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch
diff --git a/software/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch b/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch
similarity index 100%
rename from software/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch
rename to buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch
diff --git a/software/package/librsync/Config.in b/buildroot/package/librsync/Config.in
similarity index 100%
rename from software/package/librsync/Config.in
rename to buildroot/package/librsync/Config.in
diff --git a/software/package/librsync/librsync.hash b/buildroot/package/librsync/librsync.hash
similarity index 100%
rename from software/package/librsync/librsync.hash
rename to buildroot/package/librsync/librsync.hash
diff --git a/software/package/librsync/librsync.mk b/buildroot/package/librsync/librsync.mk
similarity index 100%
rename from software/package/librsync/librsync.mk
rename to buildroot/package/librsync/librsync.mk
diff --git a/software/package/librtas/Config.in b/buildroot/package/librtas/Config.in
similarity index 100%
rename from software/package/librtas/Config.in
rename to buildroot/package/librtas/Config.in
diff --git a/software/package/librtas/librtas.hash b/buildroot/package/librtas/librtas.hash
similarity index 100%
rename from software/package/librtas/librtas.hash
rename to buildroot/package/librtas/librtas.hash
diff --git a/software/package/librtas/librtas.mk b/buildroot/package/librtas/librtas.mk
similarity index 100%
rename from software/package/librtas/librtas.mk
rename to buildroot/package/librtas/librtas.mk
diff --git a/software/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/buildroot/package/librtlsdr/0001-disable_shared_library_target_in_build.patch
similarity index 100%
rename from software/package/librtlsdr/0001-disable_shared_library_target_in_build.patch
rename to buildroot/package/librtlsdr/0001-disable_shared_library_target_in_build.patch
diff --git a/software/package/librtlsdr/Config.in b/buildroot/package/librtlsdr/Config.in
similarity index 100%
rename from software/package/librtlsdr/Config.in
rename to buildroot/package/librtlsdr/Config.in
diff --git a/software/package/librtlsdr/librtlsdr.hash b/buildroot/package/librtlsdr/librtlsdr.hash
similarity index 100%
rename from software/package/librtlsdr/librtlsdr.hash
rename to buildroot/package/librtlsdr/librtlsdr.hash
diff --git a/software/package/librtlsdr/librtlsdr.mk b/buildroot/package/librtlsdr/librtlsdr.mk
similarity index 100%
rename from software/package/librtlsdr/librtlsdr.mk
rename to buildroot/package/librtlsdr/librtlsdr.mk
diff --git a/software/package/libsamplerate/Config.in b/buildroot/package/libsamplerate/Config.in
similarity index 100%
rename from software/package/libsamplerate/Config.in
rename to buildroot/package/libsamplerate/Config.in
diff --git a/software/package/libsamplerate/libsamplerate.hash b/buildroot/package/libsamplerate/libsamplerate.hash
similarity index 100%
rename from software/package/libsamplerate/libsamplerate.hash
rename to buildroot/package/libsamplerate/libsamplerate.hash
diff --git a/software/package/libsamplerate/libsamplerate.mk b/buildroot/package/libsamplerate/libsamplerate.mk
similarity index 100%
rename from software/package/libsamplerate/libsamplerate.mk
rename to buildroot/package/libsamplerate/libsamplerate.mk
diff --git a/software/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/buildroot/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch
similarity index 100%
rename from software/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch
rename to buildroot/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch
diff --git a/software/package/libscrypt/Config.in b/buildroot/package/libscrypt/Config.in
similarity index 100%
rename from software/package/libscrypt/Config.in
rename to buildroot/package/libscrypt/Config.in
diff --git a/software/package/libscrypt/libscrypt.hash b/buildroot/package/libscrypt/libscrypt.hash
similarity index 100%
rename from software/package/libscrypt/libscrypt.hash
rename to buildroot/package/libscrypt/libscrypt.hash
diff --git a/software/package/libscrypt/libscrypt.mk b/buildroot/package/libscrypt/libscrypt.mk
similarity index 100%
rename from software/package/libscrypt/libscrypt.mk
rename to buildroot/package/libscrypt/libscrypt.mk
diff --git a/software/package/libseccomp/0001-remove-static.patch b/buildroot/package/libseccomp/0001-remove-static.patch
similarity index 100%
rename from software/package/libseccomp/0001-remove-static.patch
rename to buildroot/package/libseccomp/0001-remove-static.patch
diff --git a/software/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch b/buildroot/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch
similarity index 100%
rename from software/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch
rename to buildroot/package/libseccomp/0002-Circumvent-bug-in-uClibc-ng-syscall-on-x86_64-system.patch
diff --git a/software/package/libseccomp/Config.in b/buildroot/package/libseccomp/Config.in
similarity index 100%
rename from software/package/libseccomp/Config.in
rename to buildroot/package/libseccomp/Config.in
diff --git a/software/package/libseccomp/libseccomp.hash b/buildroot/package/libseccomp/libseccomp.hash
similarity index 100%
rename from software/package/libseccomp/libseccomp.hash
rename to buildroot/package/libseccomp/libseccomp.hash
diff --git a/software/package/libseccomp/libseccomp.mk b/buildroot/package/libseccomp/libseccomp.mk
similarity index 100%
rename from software/package/libseccomp/libseccomp.mk
rename to buildroot/package/libseccomp/libseccomp.mk
diff --git a/software/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch b/buildroot/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch
similarity index 100%
rename from software/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch
rename to buildroot/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch
diff --git a/software/package/libsecret/Config.in b/buildroot/package/libsecret/Config.in
similarity index 100%
rename from software/package/libsecret/Config.in
rename to buildroot/package/libsecret/Config.in
diff --git a/software/package/libsecret/libsecret.hash b/buildroot/package/libsecret/libsecret.hash
similarity index 100%
rename from software/package/libsecret/libsecret.hash
rename to buildroot/package/libsecret/libsecret.hash
diff --git a/software/package/libsecret/libsecret.mk b/buildroot/package/libsecret/libsecret.mk
similarity index 100%
rename from software/package/libsecret/libsecret.mk
rename to buildroot/package/libsecret/libsecret.mk
diff --git a/software/package/libselinux/0001-fix-musl-build.patch b/buildroot/package/libselinux/0001-fix-musl-build.patch
similarity index 100%
rename from software/package/libselinux/0001-fix-musl-build.patch
rename to buildroot/package/libselinux/0001-fix-musl-build.patch
diff --git a/software/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch b/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch
similarity index 100%
rename from software/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch
rename to buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch
diff --git a/software/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch b/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch
similarity index 100%
rename from software/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch
rename to buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch
diff --git a/software/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch
similarity index 100%
rename from software/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch
rename to buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch
diff --git a/software/package/libselinux/Config.in b/buildroot/package/libselinux/Config.in
similarity index 100%
rename from software/package/libselinux/Config.in
rename to buildroot/package/libselinux/Config.in
diff --git a/software/package/libselinux/libselinux.hash b/buildroot/package/libselinux/libselinux.hash
similarity index 100%
rename from software/package/libselinux/libselinux.hash
rename to buildroot/package/libselinux/libselinux.hash
diff --git a/software/package/libselinux/libselinux.mk b/buildroot/package/libselinux/libselinux.mk
similarity index 100%
rename from software/package/libselinux/libselinux.mk
rename to buildroot/package/libselinux/libselinux.mk
diff --git a/software/package/libsemanage/Config.in b/buildroot/package/libsemanage/Config.in
similarity index 100%
rename from software/package/libsemanage/Config.in
rename to buildroot/package/libsemanage/Config.in
diff --git a/software/package/libsemanage/libsemanage.hash b/buildroot/package/libsemanage/libsemanage.hash
similarity index 100%
rename from software/package/libsemanage/libsemanage.hash
rename to buildroot/package/libsemanage/libsemanage.hash
diff --git a/software/package/libsemanage/libsemanage.mk b/buildroot/package/libsemanage/libsemanage.mk
similarity index 100%
rename from software/package/libsemanage/libsemanage.mk
rename to buildroot/package/libsemanage/libsemanage.mk
diff --git a/software/package/libsepol/0001-support-static-only.patch b/buildroot/package/libsepol/0001-support-static-only.patch
similarity index 100%
rename from software/package/libsepol/0001-support-static-only.patch
rename to buildroot/package/libsepol/0001-support-static-only.patch
diff --git a/software/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch b/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch
similarity index 100%
rename from software/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch
rename to buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch
diff --git a/software/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch b/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch
similarity index 100%
rename from software/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch
rename to buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch
diff --git a/software/package/libsepol/Config.in b/buildroot/package/libsepol/Config.in
similarity index 100%
rename from software/package/libsepol/Config.in
rename to buildroot/package/libsepol/Config.in
diff --git a/software/package/libsepol/libsepol.hash b/buildroot/package/libsepol/libsepol.hash
similarity index 100%
rename from software/package/libsepol/libsepol.hash
rename to buildroot/package/libsepol/libsepol.hash
diff --git a/software/package/libsepol/libsepol.mk b/buildroot/package/libsepol/libsepol.mk
similarity index 100%
rename from software/package/libsepol/libsepol.mk
rename to buildroot/package/libsepol/libsepol.mk
diff --git a/software/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch b/buildroot/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch
similarity index 100%
rename from software/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch
rename to buildroot/package/libserial/0001-SerialPort.cpp-fix-build-when-size_t-is-an-unsigned-.patch
diff --git a/software/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch b/buildroot/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch
similarity index 100%
rename from software/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch
rename to buildroot/package/libserial/0002-SerialPort.cpp-don-t-use-high-baudrates-when-not-ava.patch
diff --git a/software/package/libserial/Config.in b/buildroot/package/libserial/Config.in
similarity index 100%
rename from software/package/libserial/Config.in
rename to buildroot/package/libserial/Config.in
diff --git a/software/package/libserial/libserial.hash b/buildroot/package/libserial/libserial.hash
similarity index 100%
rename from software/package/libserial/libserial.hash
rename to buildroot/package/libserial/libserial.hash
diff --git a/software/package/libserial/libserial.mk b/buildroot/package/libserial/libserial.mk
similarity index 100%
rename from software/package/libserial/libserial.mk
rename to buildroot/package/libserial/libserial.mk
diff --git a/software/package/libserialport/0001-uclinux-detection.patch b/buildroot/package/libserialport/0001-uclinux-detection.patch
similarity index 100%
rename from software/package/libserialport/0001-uclinux-detection.patch
rename to buildroot/package/libserialport/0001-uclinux-detection.patch
diff --git a/software/package/libserialport/Config.in b/buildroot/package/libserialport/Config.in
similarity index 100%
rename from software/package/libserialport/Config.in
rename to buildroot/package/libserialport/Config.in
diff --git a/software/package/libserialport/libserialport.hash b/buildroot/package/libserialport/libserialport.hash
similarity index 100%
rename from software/package/libserialport/libserialport.hash
rename to buildroot/package/libserialport/libserialport.hash
diff --git a/software/package/libserialport/libserialport.mk b/buildroot/package/libserialport/libserialport.mk
similarity index 100%
rename from software/package/libserialport/libserialport.mk
rename to buildroot/package/libserialport/libserialport.mk
diff --git a/software/package/libsexy/Config.in b/buildroot/package/libsexy/Config.in
similarity index 100%
rename from software/package/libsexy/Config.in
rename to buildroot/package/libsexy/Config.in
diff --git a/software/package/libsexy/libsexy.hash b/buildroot/package/libsexy/libsexy.hash
similarity index 100%
rename from software/package/libsexy/libsexy.hash
rename to buildroot/package/libsexy/libsexy.hash
diff --git a/software/package/libsexy/libsexy.mk b/buildroot/package/libsexy/libsexy.mk
similarity index 100%
rename from software/package/libsexy/libsexy.mk
rename to buildroot/package/libsexy/libsexy.mk
diff --git a/software/package/libsha1/Config.in b/buildroot/package/libsha1/Config.in
similarity index 100%
rename from software/package/libsha1/Config.in
rename to buildroot/package/libsha1/Config.in
diff --git a/software/package/libsha1/libsha1.hash b/buildroot/package/libsha1/libsha1.hash
similarity index 100%
rename from software/package/libsha1/libsha1.hash
rename to buildroot/package/libsha1/libsha1.hash
diff --git a/software/package/libsha1/libsha1.mk b/buildroot/package/libsha1/libsha1.mk
similarity index 100%
rename from software/package/libsha1/libsha1.mk
rename to buildroot/package/libsha1/libsha1.mk
diff --git a/software/package/libshairplay/Config.in b/buildroot/package/libshairplay/Config.in
similarity index 100%
rename from software/package/libshairplay/Config.in
rename to buildroot/package/libshairplay/Config.in
diff --git a/software/package/libshairplay/libshairplay.hash b/buildroot/package/libshairplay/libshairplay.hash
similarity index 100%
rename from software/package/libshairplay/libshairplay.hash
rename to buildroot/package/libshairplay/libshairplay.hash
diff --git a/software/package/libshairplay/libshairplay.mk b/buildroot/package/libshairplay/libshairplay.mk
similarity index 100%
rename from software/package/libshairplay/libshairplay.mk
rename to buildroot/package/libshairplay/libshairplay.mk
diff --git a/software/package/libshout/Config.in b/buildroot/package/libshout/Config.in
similarity index 100%
rename from software/package/libshout/Config.in
rename to buildroot/package/libshout/Config.in
diff --git a/software/package/libshout/libshout.hash b/buildroot/package/libshout/libshout.hash
similarity index 100%
rename from software/package/libshout/libshout.hash
rename to buildroot/package/libshout/libshout.hash
diff --git a/software/package/libshout/libshout.mk b/buildroot/package/libshout/libshout.mk
similarity index 100%
rename from software/package/libshout/libshout.mk
rename to buildroot/package/libshout/libshout.mk
diff --git a/software/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch b/buildroot/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch
similarity index 100%
rename from software/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch
rename to buildroot/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch
diff --git a/software/package/libsidplay2/0002-pkg-config.patch b/buildroot/package/libsidplay2/0002-pkg-config.patch
similarity index 100%
rename from software/package/libsidplay2/0002-pkg-config.patch
rename to buildroot/package/libsidplay2/0002-pkg-config.patch
diff --git a/software/package/libsidplay2/0003-gcc6.patch b/buildroot/package/libsidplay2/0003-gcc6.patch
similarity index 100%
rename from software/package/libsidplay2/0003-gcc6.patch
rename to buildroot/package/libsidplay2/0003-gcc6.patch
diff --git a/software/package/libsidplay2/Config.in b/buildroot/package/libsidplay2/Config.in
similarity index 100%
rename from software/package/libsidplay2/Config.in
rename to buildroot/package/libsidplay2/Config.in
diff --git a/software/package/libsidplay2/libsidplay2.hash b/buildroot/package/libsidplay2/libsidplay2.hash
similarity index 100%
rename from software/package/libsidplay2/libsidplay2.hash
rename to buildroot/package/libsidplay2/libsidplay2.hash
diff --git a/software/package/libsidplay2/libsidplay2.mk b/buildroot/package/libsidplay2/libsidplay2.mk
similarity index 100%
rename from software/package/libsidplay2/libsidplay2.mk
rename to buildroot/package/libsidplay2/libsidplay2.mk
diff --git a/software/package/libsigc/Config.in b/buildroot/package/libsigc/Config.in
similarity index 100%
rename from software/package/libsigc/Config.in
rename to buildroot/package/libsigc/Config.in
diff --git a/software/package/libsigc/libsigc.hash b/buildroot/package/libsigc/libsigc.hash
similarity index 100%
rename from software/package/libsigc/libsigc.hash
rename to buildroot/package/libsigc/libsigc.hash
diff --git a/software/package/libsigc/libsigc.mk b/buildroot/package/libsigc/libsigc.mk
similarity index 100%
rename from software/package/libsigc/libsigc.mk
rename to buildroot/package/libsigc/libsigc.mk
diff --git a/software/package/libsigrok/Config.in b/buildroot/package/libsigrok/Config.in
similarity index 100%
rename from software/package/libsigrok/Config.in
rename to buildroot/package/libsigrok/Config.in
diff --git a/software/package/libsigrok/libsigrok.hash b/buildroot/package/libsigrok/libsigrok.hash
similarity index 100%
rename from software/package/libsigrok/libsigrok.hash
rename to buildroot/package/libsigrok/libsigrok.hash
diff --git a/software/package/libsigrok/libsigrok.mk b/buildroot/package/libsigrok/libsigrok.mk
similarity index 100%
rename from software/package/libsigrok/libsigrok.mk
rename to buildroot/package/libsigrok/libsigrok.mk
diff --git a/software/package/libsigrokdecode/Config.in b/buildroot/package/libsigrokdecode/Config.in
similarity index 100%
rename from software/package/libsigrokdecode/Config.in
rename to buildroot/package/libsigrokdecode/Config.in
diff --git a/software/package/libsigrokdecode/libsigrokdecode.hash b/buildroot/package/libsigrokdecode/libsigrokdecode.hash
similarity index 100%
rename from software/package/libsigrokdecode/libsigrokdecode.hash
rename to buildroot/package/libsigrokdecode/libsigrokdecode.hash
diff --git a/software/package/libsigrokdecode/libsigrokdecode.mk b/buildroot/package/libsigrokdecode/libsigrokdecode.mk
similarity index 100%
rename from software/package/libsigrokdecode/libsigrokdecode.mk
rename to buildroot/package/libsigrokdecode/libsigrokdecode.mk
diff --git a/software/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch b/buildroot/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch
similarity index 100%
rename from software/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch
rename to buildroot/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch
diff --git a/software/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch b/buildroot/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch
similarity index 100%
rename from software/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch
rename to buildroot/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch
diff --git a/software/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch b/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch
similarity index 100%
rename from software/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch
rename to buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch
diff --git a/software/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch b/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch
similarity index 100%
rename from software/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch
rename to buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch
diff --git a/software/package/libsigsegv/Config.in b/buildroot/package/libsigsegv/Config.in
similarity index 100%
rename from software/package/libsigsegv/Config.in
rename to buildroot/package/libsigsegv/Config.in
diff --git a/software/package/libsigsegv/libsigsegv.hash b/buildroot/package/libsigsegv/libsigsegv.hash
similarity index 100%
rename from software/package/libsigsegv/libsigsegv.hash
rename to buildroot/package/libsigsegv/libsigsegv.hash
diff --git a/software/package/libsigsegv/libsigsegv.mk b/buildroot/package/libsigsegv/libsigsegv.mk
similarity index 100%
rename from software/package/libsigsegv/libsigsegv.mk
rename to buildroot/package/libsigsegv/libsigsegv.mk
diff --git a/software/package/libsilk/Config.in b/buildroot/package/libsilk/Config.in
similarity index 100%
rename from software/package/libsilk/Config.in
rename to buildroot/package/libsilk/Config.in
diff --git a/software/package/libsilk/libsilk.hash b/buildroot/package/libsilk/libsilk.hash
similarity index 100%
rename from software/package/libsilk/libsilk.hash
rename to buildroot/package/libsilk/libsilk.hash
diff --git a/software/package/libsilk/libsilk.mk b/buildroot/package/libsilk/libsilk.mk
similarity index 100%
rename from software/package/libsilk/libsilk.mk
rename to buildroot/package/libsilk/libsilk.mk
diff --git a/software/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch b/buildroot/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch
similarity index 100%
rename from software/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch
rename to buildroot/package/libsndfile/0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch
diff --git a/software/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch b/buildroot/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch
similarity index 100%
rename from software/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch
rename to buildroot/package/libsndfile/0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch
diff --git a/software/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch b/buildroot/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch
similarity index 100%
rename from software/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch
rename to buildroot/package/libsndfile/0003-a-ulaw-fix-multiple-buffer-overflows-432.patch
diff --git a/software/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch b/buildroot/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch
similarity index 100%
rename from software/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch
rename to buildroot/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch
diff --git a/software/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch b/buildroot/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch
similarity index 100%
rename from software/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch
rename to buildroot/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch
diff --git a/software/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch b/buildroot/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch
similarity index 100%
rename from software/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch
rename to buildroot/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch
diff --git a/software/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch b/buildroot/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch
similarity index 100%
rename from software/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch
rename to buildroot/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch
diff --git a/software/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch b/buildroot/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch
similarity index 100%
rename from software/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch
rename to buildroot/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch
diff --git a/software/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch b/buildroot/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch
similarity index 100%
rename from software/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch
rename to buildroot/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch
diff --git a/software/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch b/buildroot/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch
similarity index 100%
rename from software/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch
rename to buildroot/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch
diff --git a/software/package/libsndfile/Config.in b/buildroot/package/libsndfile/Config.in
similarity index 100%
rename from software/package/libsndfile/Config.in
rename to buildroot/package/libsndfile/Config.in
diff --git a/software/package/libsndfile/libsndfile.hash b/buildroot/package/libsndfile/libsndfile.hash
similarity index 100%
rename from software/package/libsndfile/libsndfile.hash
rename to buildroot/package/libsndfile/libsndfile.hash
diff --git a/software/package/libsndfile/libsndfile.mk b/buildroot/package/libsndfile/libsndfile.mk
similarity index 100%
rename from software/package/libsndfile/libsndfile.mk
rename to buildroot/package/libsndfile/libsndfile.mk
diff --git a/software/package/libsoc/Config.in b/buildroot/package/libsoc/Config.in
similarity index 100%
rename from software/package/libsoc/Config.in
rename to buildroot/package/libsoc/Config.in
diff --git a/software/package/libsoc/libsoc.hash b/buildroot/package/libsoc/libsoc.hash
similarity index 100%
rename from software/package/libsoc/libsoc.hash
rename to buildroot/package/libsoc/libsoc.hash
diff --git a/software/package/libsoc/libsoc.mk b/buildroot/package/libsoc/libsoc.mk
similarity index 100%
rename from software/package/libsoc/libsoc.mk
rename to buildroot/package/libsoc/libsoc.mk
diff --git a/software/package/libsocketcan/Config.in b/buildroot/package/libsocketcan/Config.in
similarity index 100%
rename from software/package/libsocketcan/Config.in
rename to buildroot/package/libsocketcan/Config.in
diff --git a/software/package/libsocketcan/libsocketcan.hash b/buildroot/package/libsocketcan/libsocketcan.hash
similarity index 100%
rename from software/package/libsocketcan/libsocketcan.hash
rename to buildroot/package/libsocketcan/libsocketcan.hash
diff --git a/software/package/libsocketcan/libsocketcan.mk b/buildroot/package/libsocketcan/libsocketcan.mk
similarity index 100%
rename from software/package/libsocketcan/libsocketcan.mk
rename to buildroot/package/libsocketcan/libsocketcan.mk
diff --git a/software/package/libsodium/Config.in b/buildroot/package/libsodium/Config.in
similarity index 100%
rename from software/package/libsodium/Config.in
rename to buildroot/package/libsodium/Config.in
diff --git a/software/package/libsodium/libsodium.hash b/buildroot/package/libsodium/libsodium.hash
similarity index 100%
rename from software/package/libsodium/libsodium.hash
rename to buildroot/package/libsodium/libsodium.hash
diff --git a/software/package/libsodium/libsodium.mk b/buildroot/package/libsodium/libsodium.mk
similarity index 100%
rename from software/package/libsodium/libsodium.mk
rename to buildroot/package/libsodium/libsodium.mk
diff --git a/software/package/libsoil/0001-fix-makefile.patch b/buildroot/package/libsoil/0001-fix-makefile.patch
similarity index 100%
rename from software/package/libsoil/0001-fix-makefile.patch
rename to buildroot/package/libsoil/0001-fix-makefile.patch
diff --git a/software/package/libsoil/Config.in b/buildroot/package/libsoil/Config.in
similarity index 100%
rename from software/package/libsoil/Config.in
rename to buildroot/package/libsoil/Config.in
diff --git a/software/package/libsoil/libsoil.hash b/buildroot/package/libsoil/libsoil.hash
similarity index 100%
rename from software/package/libsoil/libsoil.hash
rename to buildroot/package/libsoil/libsoil.hash
diff --git a/software/package/libsoil/libsoil.mk b/buildroot/package/libsoil/libsoil.mk
similarity index 100%
rename from software/package/libsoil/libsoil.mk
rename to buildroot/package/libsoil/libsoil.mk
diff --git a/software/package/libsoundtouch/Config.in b/buildroot/package/libsoundtouch/Config.in
similarity index 100%
rename from software/package/libsoundtouch/Config.in
rename to buildroot/package/libsoundtouch/Config.in
diff --git a/software/package/libsoundtouch/libsoundtouch.hash b/buildroot/package/libsoundtouch/libsoundtouch.hash
similarity index 100%
rename from software/package/libsoundtouch/libsoundtouch.hash
rename to buildroot/package/libsoundtouch/libsoundtouch.hash
diff --git a/software/package/libsoundtouch/libsoundtouch.mk b/buildroot/package/libsoundtouch/libsoundtouch.mk
similarity index 100%
rename from software/package/libsoundtouch/libsoundtouch.mk
rename to buildroot/package/libsoundtouch/libsoundtouch.mk
diff --git a/software/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/buildroot/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
similarity index 100%
rename from software/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
rename to buildroot/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
diff --git a/software/package/libsoup/Config.in b/buildroot/package/libsoup/Config.in
similarity index 100%
rename from software/package/libsoup/Config.in
rename to buildroot/package/libsoup/Config.in
diff --git a/software/package/libsoup/libsoup.hash b/buildroot/package/libsoup/libsoup.hash
similarity index 100%
rename from software/package/libsoup/libsoup.hash
rename to buildroot/package/libsoup/libsoup.hash
diff --git a/software/package/libsoup/libsoup.mk b/buildroot/package/libsoup/libsoup.mk
similarity index 100%
rename from software/package/libsoup/libsoup.mk
rename to buildroot/package/libsoup/libsoup.mk
diff --git a/software/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch b/buildroot/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch
similarity index 100%
rename from software/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch
rename to buildroot/package/libsoxr/0001-Add-Libs.private-for-static-linking.patch
diff --git a/software/package/libsoxr/Config.in b/buildroot/package/libsoxr/Config.in
similarity index 100%
rename from software/package/libsoxr/Config.in
rename to buildroot/package/libsoxr/Config.in
diff --git a/software/package/libsoxr/libsoxr.hash b/buildroot/package/libsoxr/libsoxr.hash
similarity index 100%
rename from software/package/libsoxr/libsoxr.hash
rename to buildroot/package/libsoxr/libsoxr.hash
diff --git a/software/package/libsoxr/libsoxr.mk b/buildroot/package/libsoxr/libsoxr.mk
similarity index 100%
rename from software/package/libsoxr/libsoxr.mk
rename to buildroot/package/libsoxr/libsoxr.mk
diff --git a/software/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch b/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch
similarity index 100%
rename from software/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch
rename to buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch
diff --git a/software/package/libspatialindex/Config.in b/buildroot/package/libspatialindex/Config.in
similarity index 100%
rename from software/package/libspatialindex/Config.in
rename to buildroot/package/libspatialindex/Config.in
diff --git a/software/package/libspatialindex/libspatialindex.hash b/buildroot/package/libspatialindex/libspatialindex.hash
similarity index 100%
rename from software/package/libspatialindex/libspatialindex.hash
rename to buildroot/package/libspatialindex/libspatialindex.hash
diff --git a/software/package/libspatialindex/libspatialindex.mk b/buildroot/package/libspatialindex/libspatialindex.mk
similarity index 100%
rename from software/package/libspatialindex/libspatialindex.mk
rename to buildroot/package/libspatialindex/libspatialindex.mk
diff --git a/software/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch b/buildroot/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
similarity index 100%
rename from software/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
rename to buildroot/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch
diff --git a/software/package/libsquish/Config.in b/buildroot/package/libsquish/Config.in
similarity index 100%
rename from software/package/libsquish/Config.in
rename to buildroot/package/libsquish/Config.in
diff --git a/software/package/libsquish/libsquish.hash b/buildroot/package/libsquish/libsquish.hash
similarity index 100%
rename from software/package/libsquish/libsquish.hash
rename to buildroot/package/libsquish/libsquish.hash
diff --git a/software/package/libsquish/libsquish.mk b/buildroot/package/libsquish/libsquish.mk
similarity index 100%
rename from software/package/libsquish/libsquish.mk
rename to buildroot/package/libsquish/libsquish.mk
diff --git a/software/package/libsrtp/Config.in b/buildroot/package/libsrtp/Config.in
similarity index 100%
rename from software/package/libsrtp/Config.in
rename to buildroot/package/libsrtp/Config.in
diff --git a/software/package/libsrtp/libsrtp.hash b/buildroot/package/libsrtp/libsrtp.hash
similarity index 100%
rename from software/package/libsrtp/libsrtp.hash
rename to buildroot/package/libsrtp/libsrtp.hash
diff --git a/software/package/libsrtp/libsrtp.mk b/buildroot/package/libsrtp/libsrtp.mk
similarity index 100%
rename from software/package/libsrtp/libsrtp.mk
rename to buildroot/package/libsrtp/libsrtp.mk
diff --git a/software/package/libss7/Config.in b/buildroot/package/libss7/Config.in
similarity index 100%
rename from software/package/libss7/Config.in
rename to buildroot/package/libss7/Config.in
diff --git a/software/package/libss7/libss7.hash b/buildroot/package/libss7/libss7.hash
similarity index 100%
rename from software/package/libss7/libss7.hash
rename to buildroot/package/libss7/libss7.hash
diff --git a/software/package/libss7/libss7.mk b/buildroot/package/libss7/libss7.mk
similarity index 100%
rename from software/package/libss7/libss7.mk
rename to buildroot/package/libss7/libss7.mk
diff --git a/software/package/libssh/Config.in b/buildroot/package/libssh/Config.in
similarity index 100%
rename from software/package/libssh/Config.in
rename to buildroot/package/libssh/Config.in
diff --git a/software/package/libssh/libssh.hash b/buildroot/package/libssh/libssh.hash
similarity index 100%
rename from software/package/libssh/libssh.hash
rename to buildroot/package/libssh/libssh.hash
diff --git a/software/package/libssh/libssh.mk b/buildroot/package/libssh/libssh.mk
similarity index 100%
rename from software/package/libssh/libssh.mk
rename to buildroot/package/libssh/libssh.mk
diff --git a/software/package/libssh2/0001-drop-custom-buildconf-script.patch b/buildroot/package/libssh2/0001-drop-custom-buildconf-script.patch
similarity index 100%
rename from software/package/libssh2/0001-drop-custom-buildconf-script.patch
rename to buildroot/package/libssh2/0001-drop-custom-buildconf-script.patch
diff --git a/software/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch b/buildroot/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch
similarity index 100%
rename from software/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch
rename to buildroot/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch
diff --git a/software/package/libssh2/0003-packet-c-improve-message-parsing.patch b/buildroot/package/libssh2/0003-packet-c-improve-message-parsing.patch
similarity index 100%
rename from software/package/libssh2/0003-packet-c-improve-message-parsing.patch
rename to buildroot/package/libssh2/0003-packet-c-improve-message-parsing.patch
diff --git a/software/package/libssh2/Config.in b/buildroot/package/libssh2/Config.in
similarity index 100%
rename from software/package/libssh2/Config.in
rename to buildroot/package/libssh2/Config.in
diff --git a/software/package/libssh2/libssh2.hash b/buildroot/package/libssh2/libssh2.hash
similarity index 100%
rename from software/package/libssh2/libssh2.hash
rename to buildroot/package/libssh2/libssh2.hash
diff --git a/software/package/libssh2/libssh2.mk b/buildroot/package/libssh2/libssh2.mk
similarity index 100%
rename from software/package/libssh2/libssh2.mk
rename to buildroot/package/libssh2/libssh2.mk
diff --git a/software/package/libstrophe/0001-make-autoreconfable.patch b/buildroot/package/libstrophe/0001-make-autoreconfable.patch
similarity index 100%
rename from software/package/libstrophe/0001-make-autoreconfable.patch
rename to buildroot/package/libstrophe/0001-make-autoreconfable.patch
diff --git a/software/package/libstrophe/Config.in b/buildroot/package/libstrophe/Config.in
similarity index 100%
rename from software/package/libstrophe/Config.in
rename to buildroot/package/libstrophe/Config.in
diff --git a/software/package/libstrophe/libstrophe.hash b/buildroot/package/libstrophe/libstrophe.hash
similarity index 100%
rename from software/package/libstrophe/libstrophe.hash
rename to buildroot/package/libstrophe/libstrophe.hash
diff --git a/software/package/libstrophe/libstrophe.mk b/buildroot/package/libstrophe/libstrophe.mk
similarity index 100%
rename from software/package/libstrophe/libstrophe.mk
rename to buildroot/package/libstrophe/libstrophe.mk
diff --git a/software/package/libsvg-cairo/Config.in b/buildroot/package/libsvg-cairo/Config.in
similarity index 100%
rename from software/package/libsvg-cairo/Config.in
rename to buildroot/package/libsvg-cairo/Config.in
diff --git a/software/package/libsvg-cairo/libsvg-cairo.hash b/buildroot/package/libsvg-cairo/libsvg-cairo.hash
similarity index 100%
rename from software/package/libsvg-cairo/libsvg-cairo.hash
rename to buildroot/package/libsvg-cairo/libsvg-cairo.hash
diff --git a/software/package/libsvg-cairo/libsvg-cairo.mk b/buildroot/package/libsvg-cairo/libsvg-cairo.mk
similarity index 100%
rename from software/package/libsvg-cairo/libsvg-cairo.mk
rename to buildroot/package/libsvg-cairo/libsvg-cairo.mk
diff --git a/software/package/libsvg/0001-fix-expat-static-declaration.patch b/buildroot/package/libsvg/0001-fix-expat-static-declaration.patch
similarity index 100%
rename from software/package/libsvg/0001-fix-expat-static-declaration.patch
rename to buildroot/package/libsvg/0001-fix-expat-static-declaration.patch
diff --git a/software/package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch b/buildroot/package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch
similarity index 100%
rename from software/package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch
rename to buildroot/package/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch
diff --git a/software/package/libsvg/Config.in b/buildroot/package/libsvg/Config.in
similarity index 100%
rename from software/package/libsvg/Config.in
rename to buildroot/package/libsvg/Config.in
diff --git a/software/package/libsvg/libsvg.hash b/buildroot/package/libsvg/libsvg.hash
similarity index 100%
rename from software/package/libsvg/libsvg.hash
rename to buildroot/package/libsvg/libsvg.hash
diff --git a/software/package/libsvg/libsvg.mk b/buildroot/package/libsvg/libsvg.mk
similarity index 100%
rename from software/package/libsvg/libsvg.mk
rename to buildroot/package/libsvg/libsvg.mk
diff --git a/software/package/libsvgtiny/0001-disable-debug-printfs.patch b/buildroot/package/libsvgtiny/0001-disable-debug-printfs.patch
similarity index 100%
rename from software/package/libsvgtiny/0001-disable-debug-printfs.patch
rename to buildroot/package/libsvgtiny/0001-disable-debug-printfs.patch
diff --git a/software/package/libsvgtiny/0002-Remove-Werror.patch b/buildroot/package/libsvgtiny/0002-Remove-Werror.patch
similarity index 100%
rename from software/package/libsvgtiny/0002-Remove-Werror.patch
rename to buildroot/package/libsvgtiny/0002-Remove-Werror.patch
diff --git a/software/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch b/buildroot/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch
similarity index 100%
rename from software/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch
rename to buildroot/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch
diff --git a/software/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch b/buildroot/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch
similarity index 100%
rename from software/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch
rename to buildroot/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch
diff --git a/software/package/libsvgtiny/Config.in b/buildroot/package/libsvgtiny/Config.in
similarity index 100%
rename from software/package/libsvgtiny/Config.in
rename to buildroot/package/libsvgtiny/Config.in
diff --git a/software/package/libsvgtiny/libsvgtiny.hash b/buildroot/package/libsvgtiny/libsvgtiny.hash
similarity index 100%
rename from software/package/libsvgtiny/libsvgtiny.hash
rename to buildroot/package/libsvgtiny/libsvgtiny.hash
diff --git a/software/package/libsvgtiny/libsvgtiny.mk b/buildroot/package/libsvgtiny/libsvgtiny.mk
similarity index 100%
rename from software/package/libsvgtiny/libsvgtiny.mk
rename to buildroot/package/libsvgtiny/libsvgtiny.mk
diff --git a/software/package/libsysfs/Config.in b/buildroot/package/libsysfs/Config.in
similarity index 100%
rename from software/package/libsysfs/Config.in
rename to buildroot/package/libsysfs/Config.in
diff --git a/software/package/libsysfs/libsysfs.hash b/buildroot/package/libsysfs/libsysfs.hash
similarity index 100%
rename from software/package/libsysfs/libsysfs.hash
rename to buildroot/package/libsysfs/libsysfs.hash
diff --git a/software/package/libsysfs/libsysfs.mk b/buildroot/package/libsysfs/libsysfs.mk
similarity index 100%
rename from software/package/libsysfs/libsysfs.mk
rename to buildroot/package/libsysfs/libsysfs.mk
diff --git a/software/package/libtasn1/Config.in b/buildroot/package/libtasn1/Config.in
similarity index 100%
rename from software/package/libtasn1/Config.in
rename to buildroot/package/libtasn1/Config.in
diff --git a/software/package/libtasn1/libtasn1.hash b/buildroot/package/libtasn1/libtasn1.hash
similarity index 100%
rename from software/package/libtasn1/libtasn1.hash
rename to buildroot/package/libtasn1/libtasn1.hash
diff --git a/software/package/libtasn1/libtasn1.mk b/buildroot/package/libtasn1/libtasn1.mk
similarity index 100%
rename from software/package/libtasn1/libtasn1.mk
rename to buildroot/package/libtasn1/libtasn1.mk
diff --git a/software/package/libtelnet/0001-fix-compilation-without-zlib.patch b/buildroot/package/libtelnet/0001-fix-compilation-without-zlib.patch
similarity index 100%
rename from software/package/libtelnet/0001-fix-compilation-without-zlib.patch
rename to buildroot/package/libtelnet/0001-fix-compilation-without-zlib.patch
diff --git a/software/package/libtelnet/Config.in b/buildroot/package/libtelnet/Config.in
similarity index 100%
rename from software/package/libtelnet/Config.in
rename to buildroot/package/libtelnet/Config.in
diff --git a/software/package/libtelnet/libtelnet.hash b/buildroot/package/libtelnet/libtelnet.hash
similarity index 100%
rename from software/package/libtelnet/libtelnet.hash
rename to buildroot/package/libtelnet/libtelnet.hash
diff --git a/software/package/libtelnet/libtelnet.mk b/buildroot/package/libtelnet/libtelnet.mk
similarity index 100%
rename from software/package/libtelnet/libtelnet.mk
rename to buildroot/package/libtelnet/libtelnet.mk
diff --git a/software/package/libtheora/0001-link-libtheoradec.patch b/buildroot/package/libtheora/0001-link-libtheoradec.patch
similarity index 100%
rename from software/package/libtheora/0001-link-libtheoradec.patch
rename to buildroot/package/libtheora/0001-link-libtheoradec.patch
diff --git a/software/package/libtheora/0002-fix-autoreconf.patch b/buildroot/package/libtheora/0002-fix-autoreconf.patch
similarity index 100%
rename from software/package/libtheora/0002-fix-autoreconf.patch
rename to buildroot/package/libtheora/0002-fix-autoreconf.patch
diff --git a/software/package/libtheora/Config.in b/buildroot/package/libtheora/Config.in
similarity index 100%
rename from software/package/libtheora/Config.in
rename to buildroot/package/libtheora/Config.in
diff --git a/software/package/libtheora/libtheora.hash b/buildroot/package/libtheora/libtheora.hash
similarity index 100%
rename from software/package/libtheora/libtheora.hash
rename to buildroot/package/libtheora/libtheora.hash
diff --git a/software/package/libtheora/libtheora.mk b/buildroot/package/libtheora/libtheora.mk
similarity index 100%
rename from software/package/libtheora/libtheora.mk
rename to buildroot/package/libtheora/libtheora.mk
diff --git a/software/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
similarity index 100%
rename from software/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
rename to buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
diff --git a/software/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch b/buildroot/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch
similarity index 100%
rename from software/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch
rename to buildroot/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch
diff --git a/software/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/buildroot/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
similarity index 100%
rename from software/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
rename to buildroot/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
diff --git a/software/package/libtirpc/Config.in b/buildroot/package/libtirpc/Config.in
similarity index 100%
rename from software/package/libtirpc/Config.in
rename to buildroot/package/libtirpc/Config.in
diff --git a/software/package/libtirpc/libtirpc.hash b/buildroot/package/libtirpc/libtirpc.hash
similarity index 100%
rename from software/package/libtirpc/libtirpc.hash
rename to buildroot/package/libtirpc/libtirpc.hash
diff --git a/software/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk
similarity index 100%
rename from software/package/libtirpc/libtirpc.mk
rename to buildroot/package/libtirpc/libtirpc.mk
diff --git a/software/package/libtomcrypt/0001-fix-CVE-2019-17362.patch b/buildroot/package/libtomcrypt/0001-fix-CVE-2019-17362.patch
similarity index 100%
rename from software/package/libtomcrypt/0001-fix-CVE-2019-17362.patch
rename to buildroot/package/libtomcrypt/0001-fix-CVE-2019-17362.patch
diff --git a/software/package/libtomcrypt/Config.in b/buildroot/package/libtomcrypt/Config.in
similarity index 100%
rename from software/package/libtomcrypt/Config.in
rename to buildroot/package/libtomcrypt/Config.in
diff --git a/software/package/libtomcrypt/libtomcrypt.hash b/buildroot/package/libtomcrypt/libtomcrypt.hash
similarity index 100%
rename from software/package/libtomcrypt/libtomcrypt.hash
rename to buildroot/package/libtomcrypt/libtomcrypt.hash
diff --git a/software/package/libtomcrypt/libtomcrypt.mk b/buildroot/package/libtomcrypt/libtomcrypt.mk
similarity index 100%
rename from software/package/libtomcrypt/libtomcrypt.mk
rename to buildroot/package/libtomcrypt/libtomcrypt.mk
diff --git a/software/package/libtommath/Config.in b/buildroot/package/libtommath/Config.in
similarity index 100%
rename from software/package/libtommath/Config.in
rename to buildroot/package/libtommath/Config.in
diff --git a/software/package/libtommath/libtommath.hash b/buildroot/package/libtommath/libtommath.hash
similarity index 100%
rename from software/package/libtommath/libtommath.hash
rename to buildroot/package/libtommath/libtommath.hash
diff --git a/software/package/libtommath/libtommath.mk b/buildroot/package/libtommath/libtommath.mk
similarity index 100%
rename from software/package/libtommath/libtommath.mk
rename to buildroot/package/libtommath/libtommath.mk
diff --git a/software/package/libtool/Config.in b/buildroot/package/libtool/Config.in
similarity index 100%
rename from software/package/libtool/Config.in
rename to buildroot/package/libtool/Config.in
diff --git a/software/package/libtool/libtool.hash b/buildroot/package/libtool/libtool.hash
similarity index 100%
rename from software/package/libtool/libtool.hash
rename to buildroot/package/libtool/libtool.hash
diff --git a/software/package/libtool/libtool.mk b/buildroot/package/libtool/libtool.mk
similarity index 100%
rename from software/package/libtool/libtool.mk
rename to buildroot/package/libtool/libtool.mk
diff --git a/software/package/libtorrent-rasterbar/Config.in b/buildroot/package/libtorrent-rasterbar/Config.in
similarity index 100%
rename from software/package/libtorrent-rasterbar/Config.in
rename to buildroot/package/libtorrent-rasterbar/Config.in
diff --git a/software/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash
similarity index 100%
rename from software/package/libtorrent-rasterbar/libtorrent-rasterbar.hash
rename to buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash
diff --git a/software/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk
similarity index 100%
rename from software/package/libtorrent-rasterbar/libtorrent-rasterbar.mk
rename to buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk
diff --git a/software/package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch b/buildroot/package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch
similarity index 100%
rename from software/package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch
rename to buildroot/package/libtorrent/0001-libtorrent.pc.in-add-Libs.Private.patch
diff --git a/software/package/libtorrent/Config.in b/buildroot/package/libtorrent/Config.in
similarity index 100%
rename from software/package/libtorrent/Config.in
rename to buildroot/package/libtorrent/Config.in
diff --git a/software/package/libtorrent/libtorrent.hash b/buildroot/package/libtorrent/libtorrent.hash
similarity index 100%
rename from software/package/libtorrent/libtorrent.hash
rename to buildroot/package/libtorrent/libtorrent.hash
diff --git a/software/package/libtorrent/libtorrent.mk b/buildroot/package/libtorrent/libtorrent.mk
similarity index 100%
rename from software/package/libtorrent/libtorrent.mk
rename to buildroot/package/libtorrent/libtorrent.mk
diff --git a/software/package/libtpl/Config.in b/buildroot/package/libtpl/Config.in
similarity index 100%
rename from software/package/libtpl/Config.in
rename to buildroot/package/libtpl/Config.in
diff --git a/software/package/libtpl/libtpl.hash b/buildroot/package/libtpl/libtpl.hash
similarity index 100%
rename from software/package/libtpl/libtpl.hash
rename to buildroot/package/libtpl/libtpl.hash
diff --git a/software/package/libtpl/libtpl.mk b/buildroot/package/libtpl/libtpl.mk
similarity index 100%
rename from software/package/libtpl/libtpl.mk
rename to buildroot/package/libtpl/libtpl.mk
diff --git a/software/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch b/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch
similarity index 100%
rename from software/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch
rename to buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch
diff --git a/software/package/libubootenv/Config.in b/buildroot/package/libubootenv/Config.in
similarity index 100%
rename from software/package/libubootenv/Config.in
rename to buildroot/package/libubootenv/Config.in
diff --git a/software/package/libubootenv/libubootenv.hash b/buildroot/package/libubootenv/libubootenv.hash
similarity index 100%
rename from software/package/libubootenv/libubootenv.hash
rename to buildroot/package/libubootenv/libubootenv.hash
diff --git a/software/package/libubootenv/libubootenv.mk b/buildroot/package/libubootenv/libubootenv.mk
similarity index 100%
rename from software/package/libubootenv/libubootenv.mk
rename to buildroot/package/libubootenv/libubootenv.mk
diff --git a/software/package/libubox/Config.in b/buildroot/package/libubox/Config.in
similarity index 100%
rename from software/package/libubox/Config.in
rename to buildroot/package/libubox/Config.in
diff --git a/software/package/libubox/libubox.mk b/buildroot/package/libubox/libubox.mk
similarity index 100%
rename from software/package/libubox/libubox.mk
rename to buildroot/package/libubox/libubox.mk
diff --git a/software/package/libuci/Config.in b/buildroot/package/libuci/Config.in
similarity index 100%
rename from software/package/libuci/Config.in
rename to buildroot/package/libuci/Config.in
diff --git a/software/package/libuci/libuci.hash b/buildroot/package/libuci/libuci.hash
similarity index 100%
rename from software/package/libuci/libuci.hash
rename to buildroot/package/libuci/libuci.hash
diff --git a/software/package/libuci/libuci.mk b/buildroot/package/libuci/libuci.mk
similarity index 100%
rename from software/package/libuci/libuci.mk
rename to buildroot/package/libuci/libuci.mk
diff --git a/software/package/libucl/Config.in b/buildroot/package/libucl/Config.in
similarity index 100%
rename from software/package/libucl/Config.in
rename to buildroot/package/libucl/Config.in
diff --git a/software/package/libucl/libucl.hash b/buildroot/package/libucl/libucl.hash
similarity index 100%
rename from software/package/libucl/libucl.hash
rename to buildroot/package/libucl/libucl.hash
diff --git a/software/package/libucl/libucl.mk b/buildroot/package/libucl/libucl.mk
similarity index 100%
rename from software/package/libucl/libucl.mk
rename to buildroot/package/libucl/libucl.mk
diff --git a/software/package/libuecc/Config.in b/buildroot/package/libuecc/Config.in
similarity index 100%
rename from software/package/libuecc/Config.in
rename to buildroot/package/libuecc/Config.in
diff --git a/software/package/libuecc/libuecc.hash b/buildroot/package/libuecc/libuecc.hash
similarity index 100%
rename from software/package/libuecc/libuecc.hash
rename to buildroot/package/libuecc/libuecc.hash
diff --git a/software/package/libuecc/libuecc.mk b/buildroot/package/libuecc/libuecc.mk
similarity index 100%
rename from software/package/libuecc/libuecc.mk
rename to buildroot/package/libuecc/libuecc.mk
diff --git a/software/package/libuio/0001-configure-remove-po-Makefile.in.patch b/buildroot/package/libuio/0001-configure-remove-po-Makefile.in.patch
similarity index 100%
rename from software/package/libuio/0001-configure-remove-po-Makefile.in.patch
rename to buildroot/package/libuio/0001-configure-remove-po-Makefile.in.patch
diff --git a/software/package/libuio/0002-fix-build-with-musl.patch b/buildroot/package/libuio/0002-fix-build-with-musl.patch
similarity index 100%
rename from software/package/libuio/0002-fix-build-with-musl.patch
rename to buildroot/package/libuio/0002-fix-build-with-musl.patch
diff --git a/software/package/libuio/Config.in b/buildroot/package/libuio/Config.in
similarity index 100%
rename from software/package/libuio/Config.in
rename to buildroot/package/libuio/Config.in
diff --git a/software/package/libuio/libuio.hash b/buildroot/package/libuio/libuio.hash
similarity index 100%
rename from software/package/libuio/libuio.hash
rename to buildroot/package/libuio/libuio.hash
diff --git a/software/package/libuio/libuio.mk b/buildroot/package/libuio/libuio.mk
similarity index 100%
rename from software/package/libuio/libuio.mk
rename to buildroot/package/libuio/libuio.mk
diff --git a/software/package/libunistring/Config.in b/buildroot/package/libunistring/Config.in
similarity index 100%
rename from software/package/libunistring/Config.in
rename to buildroot/package/libunistring/Config.in
diff --git a/software/package/libunistring/libunistring.hash b/buildroot/package/libunistring/libunistring.hash
similarity index 100%
rename from software/package/libunistring/libunistring.hash
rename to buildroot/package/libunistring/libunistring.hash
diff --git a/software/package/libunistring/libunistring.mk b/buildroot/package/libunistring/libunistring.mk
similarity index 100%
rename from software/package/libunistring/libunistring.mk
rename to buildroot/package/libunistring/libunistring.mk
diff --git a/software/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/buildroot/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
similarity index 100%
rename from software/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
rename to buildroot/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
diff --git a/software/package/libunwind/Config.in b/buildroot/package/libunwind/Config.in
similarity index 100%
rename from software/package/libunwind/Config.in
rename to buildroot/package/libunwind/Config.in
diff --git a/software/package/libunwind/libunwind.hash b/buildroot/package/libunwind/libunwind.hash
similarity index 100%
rename from software/package/libunwind/libunwind.hash
rename to buildroot/package/libunwind/libunwind.hash
diff --git a/software/package/libunwind/libunwind.mk b/buildroot/package/libunwind/libunwind.mk
similarity index 100%
rename from software/package/libunwind/libunwind.mk
rename to buildroot/package/libunwind/libunwind.mk
diff --git a/software/package/libupnp/Config.in b/buildroot/package/libupnp/Config.in
similarity index 100%
rename from software/package/libupnp/Config.in
rename to buildroot/package/libupnp/Config.in
diff --git a/software/package/libupnp/libupnp.hash b/buildroot/package/libupnp/libupnp.hash
similarity index 100%
rename from software/package/libupnp/libupnp.hash
rename to buildroot/package/libupnp/libupnp.hash
diff --git a/software/package/libupnp/libupnp.mk b/buildroot/package/libupnp/libupnp.mk
similarity index 100%
rename from software/package/libupnp/libupnp.mk
rename to buildroot/package/libupnp/libupnp.mk
diff --git a/software/package/libupnp18/Config.in b/buildroot/package/libupnp18/Config.in
similarity index 100%
rename from software/package/libupnp18/Config.in
rename to buildroot/package/libupnp18/Config.in
diff --git a/software/package/libupnp18/libupnp18.hash b/buildroot/package/libupnp18/libupnp18.hash
similarity index 100%
rename from software/package/libupnp18/libupnp18.hash
rename to buildroot/package/libupnp18/libupnp18.hash
diff --git a/software/package/libupnp18/libupnp18.mk b/buildroot/package/libupnp18/libupnp18.mk
similarity index 100%
rename from software/package/libupnp18/libupnp18.mk
rename to buildroot/package/libupnp18/libupnp18.mk
diff --git a/software/package/libupnpp/Config.in b/buildroot/package/libupnpp/Config.in
similarity index 100%
rename from software/package/libupnpp/Config.in
rename to buildroot/package/libupnpp/Config.in
diff --git a/software/package/libupnpp/libupnpp.hash b/buildroot/package/libupnpp/libupnpp.hash
similarity index 100%
rename from software/package/libupnpp/libupnpp.hash
rename to buildroot/package/libupnpp/libupnpp.hash
diff --git a/software/package/libupnpp/libupnpp.mk b/buildroot/package/libupnpp/libupnpp.mk
similarity index 100%
rename from software/package/libupnpp/libupnpp.mk
rename to buildroot/package/libupnpp/libupnpp.mk
diff --git a/software/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch b/buildroot/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch
similarity index 100%
rename from software/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch
rename to buildroot/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch
diff --git a/software/package/liburcu/Config.in b/buildroot/package/liburcu/Config.in
similarity index 100%
rename from software/package/liburcu/Config.in
rename to buildroot/package/liburcu/Config.in
diff --git a/software/package/liburcu/liburcu.hash b/buildroot/package/liburcu/liburcu.hash
similarity index 100%
rename from software/package/liburcu/liburcu.hash
rename to buildroot/package/liburcu/liburcu.hash
diff --git a/software/package/liburcu/liburcu.mk b/buildroot/package/liburcu/liburcu.mk
similarity index 100%
rename from software/package/liburcu/liburcu.mk
rename to buildroot/package/liburcu/liburcu.mk
diff --git a/software/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch
similarity index 100%
rename from software/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch
rename to buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch
diff --git a/software/package/liburiparser/Config.in b/buildroot/package/liburiparser/Config.in
similarity index 100%
rename from software/package/liburiparser/Config.in
rename to buildroot/package/liburiparser/Config.in
diff --git a/software/package/liburiparser/liburiparser.hash b/buildroot/package/liburiparser/liburiparser.hash
similarity index 100%
rename from software/package/liburiparser/liburiparser.hash
rename to buildroot/package/liburiparser/liburiparser.hash
diff --git a/software/package/liburiparser/liburiparser.mk b/buildroot/package/liburiparser/liburiparser.mk
similarity index 100%
rename from software/package/liburiparser/liburiparser.mk
rename to buildroot/package/liburiparser/liburiparser.mk
diff --git a/software/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch b/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch
similarity index 100%
rename from software/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch
rename to buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch
diff --git a/software/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch b/buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch
similarity index 100%
rename from software/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch
rename to buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch
diff --git a/software/package/libusb-compat/Config.in b/buildroot/package/libusb-compat/Config.in
similarity index 100%
rename from software/package/libusb-compat/Config.in
rename to buildroot/package/libusb-compat/Config.in
diff --git a/software/package/libusb-compat/libusb-compat.hash b/buildroot/package/libusb-compat/libusb-compat.hash
similarity index 100%
rename from software/package/libusb-compat/libusb-compat.hash
rename to buildroot/package/libusb-compat/libusb-compat.hash
diff --git a/software/package/libusb-compat/libusb-compat.mk b/buildroot/package/libusb-compat/libusb-compat.mk
similarity index 100%
rename from software/package/libusb-compat/libusb-compat.mk
rename to buildroot/package/libusb-compat/libusb-compat.mk
diff --git a/software/package/libusb/Config.in b/buildroot/package/libusb/Config.in
similarity index 100%
rename from software/package/libusb/Config.in
rename to buildroot/package/libusb/Config.in
diff --git a/software/package/libusb/libusb.hash b/buildroot/package/libusb/libusb.hash
similarity index 100%
rename from software/package/libusb/libusb.hash
rename to buildroot/package/libusb/libusb.hash
diff --git a/software/package/libusb/libusb.mk b/buildroot/package/libusb/libusb.mk
similarity index 100%
rename from software/package/libusb/libusb.mk
rename to buildroot/package/libusb/libusb.mk
diff --git a/software/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch b/buildroot/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch
similarity index 100%
rename from software/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch
rename to buildroot/package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch
diff --git a/software/package/libusbgx/Config.in b/buildroot/package/libusbgx/Config.in
similarity index 100%
rename from software/package/libusbgx/Config.in
rename to buildroot/package/libusbgx/Config.in
diff --git a/software/package/libusbgx/libusbgx.hash b/buildroot/package/libusbgx/libusbgx.hash
similarity index 100%
rename from software/package/libusbgx/libusbgx.hash
rename to buildroot/package/libusbgx/libusbgx.hash
diff --git a/software/package/libusbgx/libusbgx.mk b/buildroot/package/libusbgx/libusbgx.mk
similarity index 100%
rename from software/package/libusbgx/libusbgx.mk
rename to buildroot/package/libusbgx/libusbgx.mk
diff --git a/software/package/libuv/Config.in b/buildroot/package/libuv/Config.in
similarity index 100%
rename from software/package/libuv/Config.in
rename to buildroot/package/libuv/Config.in
diff --git a/software/package/libuv/libuv.hash b/buildroot/package/libuv/libuv.hash
similarity index 100%
rename from software/package/libuv/libuv.hash
rename to buildroot/package/libuv/libuv.hash
diff --git a/software/package/libuv/libuv.mk b/buildroot/package/libuv/libuv.mk
similarity index 100%
rename from software/package/libuv/libuv.mk
rename to buildroot/package/libuv/libuv.mk
diff --git a/software/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch b/buildroot/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch
similarity index 100%
rename from software/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch
rename to buildroot/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch
diff --git a/software/package/libv4l/0002-keytable-use-input_event-properly.patch b/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch
similarity index 100%
rename from software/package/libv4l/0002-keytable-use-input_event-properly.patch
rename to buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch
diff --git a/software/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch b/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch
similarity index 100%
rename from software/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch
rename to buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch
diff --git a/software/package/libv4l/Config.in b/buildroot/package/libv4l/Config.in
similarity index 100%
rename from software/package/libv4l/Config.in
rename to buildroot/package/libv4l/Config.in
diff --git a/software/package/libv4l/libv4l.hash b/buildroot/package/libv4l/libv4l.hash
similarity index 100%
rename from software/package/libv4l/libv4l.hash
rename to buildroot/package/libv4l/libv4l.hash
diff --git a/software/package/libv4l/libv4l.mk b/buildroot/package/libv4l/libv4l.mk
similarity index 100%
rename from software/package/libv4l/libv4l.mk
rename to buildroot/package/libv4l/libv4l.mk
diff --git a/software/package/libva-intel-driver/Config.in b/buildroot/package/libva-intel-driver/Config.in
similarity index 100%
rename from software/package/libva-intel-driver/Config.in
rename to buildroot/package/libva-intel-driver/Config.in
diff --git a/software/package/libva-intel-driver/libva-intel-driver.hash b/buildroot/package/libva-intel-driver/libva-intel-driver.hash
similarity index 100%
rename from software/package/libva-intel-driver/libva-intel-driver.hash
rename to buildroot/package/libva-intel-driver/libva-intel-driver.hash
diff --git a/software/package/libva-intel-driver/libva-intel-driver.mk b/buildroot/package/libva-intel-driver/libva-intel-driver.mk
similarity index 100%
rename from software/package/libva-intel-driver/libva-intel-driver.mk
rename to buildroot/package/libva-intel-driver/libva-intel-driver.mk
diff --git a/software/package/libva-utils/0001-fix-build-without-x11.patch b/buildroot/package/libva-utils/0001-fix-build-without-x11.patch
similarity index 100%
rename from software/package/libva-utils/0001-fix-build-without-x11.patch
rename to buildroot/package/libva-utils/0001-fix-build-without-x11.patch
diff --git a/software/package/libva-utils/Config.in b/buildroot/package/libva-utils/Config.in
similarity index 100%
rename from software/package/libva-utils/Config.in
rename to buildroot/package/libva-utils/Config.in
diff --git a/software/package/libva-utils/libva-utils.hash b/buildroot/package/libva-utils/libva-utils.hash
similarity index 100%
rename from software/package/libva-utils/libva-utils.hash
rename to buildroot/package/libva-utils/libva-utils.hash
diff --git a/software/package/libva-utils/libva-utils.mk b/buildroot/package/libva-utils/libva-utils.mk
similarity index 100%
rename from software/package/libva-utils/libva-utils.mk
rename to buildroot/package/libva-utils/libva-utils.mk
diff --git a/software/package/libva/Config.in b/buildroot/package/libva/Config.in
similarity index 100%
rename from software/package/libva/Config.in
rename to buildroot/package/libva/Config.in
diff --git a/software/package/libva/libva.hash b/buildroot/package/libva/libva.hash
similarity index 100%
rename from software/package/libva/libva.hash
rename to buildroot/package/libva/libva.hash
diff --git a/software/package/libva/libva.mk b/buildroot/package/libva/libva.mk
similarity index 100%
rename from software/package/libva/libva.mk
rename to buildroot/package/libva/libva.mk
diff --git a/software/package/libvdpau/Config.in b/buildroot/package/libvdpau/Config.in
similarity index 100%
rename from software/package/libvdpau/Config.in
rename to buildroot/package/libvdpau/Config.in
diff --git a/software/package/libvdpau/libvdpau.hash b/buildroot/package/libvdpau/libvdpau.hash
similarity index 100%
rename from software/package/libvdpau/libvdpau.hash
rename to buildroot/package/libvdpau/libvdpau.hash
diff --git a/software/package/libvdpau/libvdpau.mk b/buildroot/package/libvdpau/libvdpau.mk
similarity index 100%
rename from software/package/libvdpau/libvdpau.mk
rename to buildroot/package/libvdpau/libvdpau.mk
diff --git a/software/package/libvips/Config.in b/buildroot/package/libvips/Config.in
similarity index 100%
rename from software/package/libvips/Config.in
rename to buildroot/package/libvips/Config.in
diff --git a/software/package/libvips/libvips.hash b/buildroot/package/libvips/libvips.hash
similarity index 100%
rename from software/package/libvips/libvips.hash
rename to buildroot/package/libvips/libvips.hash
diff --git a/software/package/libvips/libvips.mk b/buildroot/package/libvips/libvips.mk
similarity index 100%
rename from software/package/libvips/libvips.mk
rename to buildroot/package/libvips/libvips.mk
diff --git a/software/package/libvncserver/Config.in b/buildroot/package/libvncserver/Config.in
similarity index 100%
rename from software/package/libvncserver/Config.in
rename to buildroot/package/libvncserver/Config.in
diff --git a/software/package/libvncserver/libvncserver.hash b/buildroot/package/libvncserver/libvncserver.hash
similarity index 100%
rename from software/package/libvncserver/libvncserver.hash
rename to buildroot/package/libvncserver/libvncserver.hash
diff --git a/software/package/libvncserver/libvncserver.mk b/buildroot/package/libvncserver/libvncserver.mk
similarity index 100%
rename from software/package/libvncserver/libvncserver.mk
rename to buildroot/package/libvncserver/libvncserver.mk
diff --git a/software/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch b/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch
similarity index 100%
rename from software/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch
rename to buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch
diff --git a/software/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch b/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch
similarity index 100%
rename from software/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch
rename to buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch
diff --git a/software/package/libvorbis/Config.in b/buildroot/package/libvorbis/Config.in
similarity index 100%
rename from software/package/libvorbis/Config.in
rename to buildroot/package/libvorbis/Config.in
diff --git a/software/package/libvorbis/libvorbis.hash b/buildroot/package/libvorbis/libvorbis.hash
similarity index 100%
rename from software/package/libvorbis/libvorbis.hash
rename to buildroot/package/libvorbis/libvorbis.hash
diff --git a/software/package/libvorbis/libvorbis.mk b/buildroot/package/libvorbis/libvorbis.mk
similarity index 100%
rename from software/package/libvorbis/libvorbis.mk
rename to buildroot/package/libvorbis/libvorbis.mk
diff --git a/software/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch b/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch
similarity index 100%
rename from software/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch
rename to buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch
diff --git a/software/package/libvpx/Config.in b/buildroot/package/libvpx/Config.in
similarity index 100%
rename from software/package/libvpx/Config.in
rename to buildroot/package/libvpx/Config.in
diff --git a/software/package/libvpx/libvpx.hash b/buildroot/package/libvpx/libvpx.hash
similarity index 100%
rename from software/package/libvpx/libvpx.hash
rename to buildroot/package/libvpx/libvpx.hash
diff --git a/software/package/libvpx/libvpx.mk b/buildroot/package/libvpx/libvpx.mk
similarity index 100%
rename from software/package/libvpx/libvpx.mk
rename to buildroot/package/libvpx/libvpx.mk
diff --git a/software/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch b/buildroot/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch
similarity index 100%
rename from software/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch
rename to buildroot/package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch
diff --git a/software/package/libwebsock/0002-fix-ssl.patch b/buildroot/package/libwebsock/0002-fix-ssl.patch
similarity index 100%
rename from software/package/libwebsock/0002-fix-ssl.patch
rename to buildroot/package/libwebsock/0002-fix-ssl.patch
diff --git a/software/package/libwebsock/0003-fix-incorrect-inline.patch b/buildroot/package/libwebsock/0003-fix-incorrect-inline.patch
similarity index 100%
rename from software/package/libwebsock/0003-fix-incorrect-inline.patch
rename to buildroot/package/libwebsock/0003-fix-incorrect-inline.patch
diff --git a/software/package/libwebsock/Config.in b/buildroot/package/libwebsock/Config.in
similarity index 100%
rename from software/package/libwebsock/Config.in
rename to buildroot/package/libwebsock/Config.in
diff --git a/software/package/libwebsock/libwebsock.hash b/buildroot/package/libwebsock/libwebsock.hash
similarity index 100%
rename from software/package/libwebsock/libwebsock.hash
rename to buildroot/package/libwebsock/libwebsock.hash
diff --git a/software/package/libwebsock/libwebsock.mk b/buildroot/package/libwebsock/libwebsock.mk
similarity index 100%
rename from software/package/libwebsock/libwebsock.mk
rename to buildroot/package/libwebsock/libwebsock.mk
diff --git a/software/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch b/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
similarity index 100%
rename from software/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
rename to buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
diff --git a/software/package/libwebsockets/Config.in b/buildroot/package/libwebsockets/Config.in
similarity index 100%
rename from software/package/libwebsockets/Config.in
rename to buildroot/package/libwebsockets/Config.in
diff --git a/software/package/libwebsockets/libwebsockets.hash b/buildroot/package/libwebsockets/libwebsockets.hash
similarity index 100%
rename from software/package/libwebsockets/libwebsockets.hash
rename to buildroot/package/libwebsockets/libwebsockets.hash
diff --git a/software/package/libwebsockets/libwebsockets.mk b/buildroot/package/libwebsockets/libwebsockets.mk
similarity index 100%
rename from software/package/libwebsockets/libwebsockets.mk
rename to buildroot/package/libwebsockets/libwebsockets.mk
diff --git a/software/package/libwpe/Config.in b/buildroot/package/libwpe/Config.in
similarity index 100%
rename from software/package/libwpe/Config.in
rename to buildroot/package/libwpe/Config.in
diff --git a/software/package/libwpe/libwpe.hash b/buildroot/package/libwpe/libwpe.hash
similarity index 100%
rename from software/package/libwpe/libwpe.hash
rename to buildroot/package/libwpe/libwpe.hash
diff --git a/software/package/libwpe/libwpe.mk b/buildroot/package/libwpe/libwpe.mk
similarity index 100%
rename from software/package/libwpe/libwpe.mk
rename to buildroot/package/libwpe/libwpe.mk
diff --git a/software/package/libxkbcommon/Config.in b/buildroot/package/libxkbcommon/Config.in
similarity index 100%
rename from software/package/libxkbcommon/Config.in
rename to buildroot/package/libxkbcommon/Config.in
diff --git a/software/package/libxkbcommon/libxkbcommon.hash b/buildroot/package/libxkbcommon/libxkbcommon.hash
similarity index 100%
rename from software/package/libxkbcommon/libxkbcommon.hash
rename to buildroot/package/libxkbcommon/libxkbcommon.hash
diff --git a/software/package/libxkbcommon/libxkbcommon.mk b/buildroot/package/libxkbcommon/libxkbcommon.mk
similarity index 100%
rename from software/package/libxkbcommon/libxkbcommon.mk
rename to buildroot/package/libxkbcommon/libxkbcommon.mk
diff --git a/software/package/libxml-parser-perl/libxml-parser-perl.hash b/buildroot/package/libxml-parser-perl/libxml-parser-perl.hash
similarity index 100%
rename from software/package/libxml-parser-perl/libxml-parser-perl.hash
rename to buildroot/package/libxml-parser-perl/libxml-parser-perl.hash
diff --git a/software/package/libxml-parser-perl/libxml-parser-perl.mk b/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk
similarity index 100%
rename from software/package/libxml-parser-perl/libxml-parser-perl.mk
rename to buildroot/package/libxml-parser-perl/libxml-parser-perl.mk
diff --git a/software/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch b/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
similarity index 100%
rename from software/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
rename to buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
diff --git a/software/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch b/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
similarity index 100%
rename from software/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
rename to buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch
diff --git a/software/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch b/buildroot/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch
similarity index 100%
rename from software/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch
rename to buildroot/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch
diff --git a/software/package/libxml2/Config.in b/buildroot/package/libxml2/Config.in
similarity index 100%
rename from software/package/libxml2/Config.in
rename to buildroot/package/libxml2/Config.in
diff --git a/software/package/libxml2/libxml2.hash b/buildroot/package/libxml2/libxml2.hash
similarity index 100%
rename from software/package/libxml2/libxml2.hash
rename to buildroot/package/libxml2/libxml2.hash
diff --git a/software/package/libxml2/libxml2.mk b/buildroot/package/libxml2/libxml2.mk
similarity index 100%
rename from software/package/libxml2/libxml2.mk
rename to buildroot/package/libxml2/libxml2.mk
diff --git a/software/package/libxmlpp/Config.in b/buildroot/package/libxmlpp/Config.in
similarity index 100%
rename from software/package/libxmlpp/Config.in
rename to buildroot/package/libxmlpp/Config.in
diff --git a/software/package/libxmlpp/libxmlpp.hash b/buildroot/package/libxmlpp/libxmlpp.hash
similarity index 100%
rename from software/package/libxmlpp/libxmlpp.hash
rename to buildroot/package/libxmlpp/libxmlpp.hash
diff --git a/software/package/libxmlpp/libxmlpp.mk b/buildroot/package/libxmlpp/libxmlpp.mk
similarity index 100%
rename from software/package/libxmlpp/libxmlpp.mk
rename to buildroot/package/libxmlpp/libxmlpp.mk
diff --git a/software/package/libxmlrpc/0001-use-correct-curl-config.patch b/buildroot/package/libxmlrpc/0001-use-correct-curl-config.patch
similarity index 100%
rename from software/package/libxmlrpc/0001-use-correct-curl-config.patch
rename to buildroot/package/libxmlrpc/0001-use-correct-curl-config.patch
diff --git a/software/package/libxmlrpc/Config.in b/buildroot/package/libxmlrpc/Config.in
similarity index 100%
rename from software/package/libxmlrpc/Config.in
rename to buildroot/package/libxmlrpc/Config.in
diff --git a/software/package/libxmlrpc/libxmlrpc.hash b/buildroot/package/libxmlrpc/libxmlrpc.hash
similarity index 100%
rename from software/package/libxmlrpc/libxmlrpc.hash
rename to buildroot/package/libxmlrpc/libxmlrpc.hash
diff --git a/software/package/libxmlrpc/libxmlrpc.mk b/buildroot/package/libxmlrpc/libxmlrpc.mk
similarity index 100%
rename from software/package/libxmlrpc/libxmlrpc.mk
rename to buildroot/package/libxmlrpc/libxmlrpc.mk
diff --git a/software/package/libxslt/Config.in b/buildroot/package/libxslt/Config.in
similarity index 100%
rename from software/package/libxslt/Config.in
rename to buildroot/package/libxslt/Config.in
diff --git a/software/package/libxslt/libxslt.hash b/buildroot/package/libxslt/libxslt.hash
similarity index 100%
rename from software/package/libxslt/libxslt.hash
rename to buildroot/package/libxslt/libxslt.hash
diff --git a/software/package/libxslt/libxslt.mk b/buildroot/package/libxslt/libxslt.mk
similarity index 100%
rename from software/package/libxslt/libxslt.mk
rename to buildroot/package/libxslt/libxslt.mk
diff --git a/software/package/libyaml/Config.in b/buildroot/package/libyaml/Config.in
similarity index 100%
rename from software/package/libyaml/Config.in
rename to buildroot/package/libyaml/Config.in
diff --git a/software/package/libyaml/libyaml.hash b/buildroot/package/libyaml/libyaml.hash
similarity index 100%
rename from software/package/libyaml/libyaml.hash
rename to buildroot/package/libyaml/libyaml.hash
diff --git a/software/package/libyaml/libyaml.mk b/buildroot/package/libyaml/libyaml.mk
similarity index 100%
rename from software/package/libyaml/libyaml.mk
rename to buildroot/package/libyaml/libyaml.mk
diff --git a/software/package/libyang/Config.in b/buildroot/package/libyang/Config.in
similarity index 100%
rename from software/package/libyang/Config.in
rename to buildroot/package/libyang/Config.in
diff --git a/software/package/libyang/libyang.hash b/buildroot/package/libyang/libyang.hash
similarity index 100%
rename from software/package/libyang/libyang.hash
rename to buildroot/package/libyang/libyang.hash
diff --git a/software/package/libyang/libyang.mk b/buildroot/package/libyang/libyang.mk
similarity index 100%
rename from software/package/libyang/libyang.mk
rename to buildroot/package/libyang/libyang.mk
diff --git a/software/package/libyuv/0001-i386-sse2.patch b/buildroot/package/libyuv/0001-i386-sse2.patch
similarity index 100%
rename from software/package/libyuv/0001-i386-sse2.patch
rename to buildroot/package/libyuv/0001-i386-sse2.patch
diff --git a/software/package/libyuv/Config.in b/buildroot/package/libyuv/Config.in
similarity index 100%
rename from software/package/libyuv/Config.in
rename to buildroot/package/libyuv/Config.in
diff --git a/software/package/libyuv/libyuv.hash b/buildroot/package/libyuv/libyuv.hash
similarity index 100%
rename from software/package/libyuv/libyuv.hash
rename to buildroot/package/libyuv/libyuv.hash
diff --git a/software/package/libyuv/libyuv.mk b/buildroot/package/libyuv/libyuv.mk
similarity index 100%
rename from software/package/libyuv/libyuv.mk
rename to buildroot/package/libyuv/libyuv.mk
diff --git a/software/package/libzip/Config.in b/buildroot/package/libzip/Config.in
similarity index 100%
rename from software/package/libzip/Config.in
rename to buildroot/package/libzip/Config.in
diff --git a/software/package/libzip/libzip.hash b/buildroot/package/libzip/libzip.hash
similarity index 100%
rename from software/package/libzip/libzip.hash
rename to buildroot/package/libzip/libzip.hash
diff --git a/software/package/libzip/libzip.mk b/buildroot/package/libzip/libzip.mk
similarity index 100%
rename from software/package/libzip/libzip.mk
rename to buildroot/package/libzip/libzip.mk
diff --git a/software/package/libzlib/libzlib.hash b/buildroot/package/libzlib/libzlib.hash
similarity index 100%
rename from software/package/libzlib/libzlib.hash
rename to buildroot/package/libzlib/libzlib.hash
diff --git a/software/package/libzlib/libzlib.mk b/buildroot/package/libzlib/libzlib.mk
similarity index 100%
rename from software/package/libzlib/libzlib.mk
rename to buildroot/package/libzlib/libzlib.mk
diff --git a/software/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch b/buildroot/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch
similarity index 100%
rename from software/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch
rename to buildroot/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch
diff --git a/software/package/lightning/Config.in b/buildroot/package/lightning/Config.in
similarity index 100%
rename from software/package/lightning/Config.in
rename to buildroot/package/lightning/Config.in
diff --git a/software/package/lightning/lightning.hash b/buildroot/package/lightning/lightning.hash
similarity index 100%
rename from software/package/lightning/lightning.hash
rename to buildroot/package/lightning/lightning.hash
diff --git a/software/package/lightning/lightning.mk b/buildroot/package/lightning/lightning.mk
similarity index 100%
rename from software/package/lightning/lightning.mk
rename to buildroot/package/lightning/lightning.mk
diff --git a/software/package/lighttpd/0001-Fix-default-config-file.patch b/buildroot/package/lighttpd/0001-Fix-default-config-file.patch
similarity index 100%
rename from software/package/lighttpd/0001-Fix-default-config-file.patch
rename to buildroot/package/lighttpd/0001-Fix-default-config-file.patch
diff --git a/software/package/lighttpd/Config.in b/buildroot/package/lighttpd/Config.in
similarity index 100%
rename from software/package/lighttpd/Config.in
rename to buildroot/package/lighttpd/Config.in
diff --git a/software/package/lighttpd/S50lighttpd b/buildroot/package/lighttpd/S50lighttpd
similarity index 100%
rename from software/package/lighttpd/S50lighttpd
rename to buildroot/package/lighttpd/S50lighttpd
diff --git a/software/package/lighttpd/lighttpd.hash b/buildroot/package/lighttpd/lighttpd.hash
similarity index 100%
rename from software/package/lighttpd/lighttpd.hash
rename to buildroot/package/lighttpd/lighttpd.hash
diff --git a/software/package/lighttpd/lighttpd.mk b/buildroot/package/lighttpd/lighttpd.mk
similarity index 100%
rename from software/package/lighttpd/lighttpd.mk
rename to buildroot/package/lighttpd/lighttpd.mk
diff --git a/software/package/lighttpd/lighttpd_tmpfiles.conf b/buildroot/package/lighttpd/lighttpd_tmpfiles.conf
similarity index 100%
rename from software/package/lighttpd/lighttpd_tmpfiles.conf
rename to buildroot/package/lighttpd/lighttpd_tmpfiles.conf
diff --git a/software/package/linenoise/Config.in b/buildroot/package/linenoise/Config.in
similarity index 100%
rename from software/package/linenoise/Config.in
rename to buildroot/package/linenoise/Config.in
diff --git a/software/package/linenoise/linenoise.hash b/buildroot/package/linenoise/linenoise.hash
similarity index 100%
rename from software/package/linenoise/linenoise.hash
rename to buildroot/package/linenoise/linenoise.hash
diff --git a/software/package/linenoise/linenoise.mk b/buildroot/package/linenoise/linenoise.mk
similarity index 100%
rename from software/package/linenoise/linenoise.mk
rename to buildroot/package/linenoise/linenoise.mk
diff --git a/software/package/linknx/0001-Link-with-libiconv-if-needed.patch b/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch
similarity index 100%
rename from software/package/linknx/0001-Link-with-libiconv-if-needed.patch
rename to buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch
diff --git a/software/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch b/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch
similarity index 100%
rename from software/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch
rename to buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch
diff --git a/software/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch b/buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch
similarity index 100%
rename from software/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch
rename to buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch
diff --git a/software/package/linknx/Config.in b/buildroot/package/linknx/Config.in
similarity index 100%
rename from software/package/linknx/Config.in
rename to buildroot/package/linknx/Config.in
diff --git a/software/package/linknx/linknx.hash b/buildroot/package/linknx/linknx.hash
similarity index 100%
rename from software/package/linknx/linknx.hash
rename to buildroot/package/linknx/linknx.hash
diff --git a/software/package/linknx/linknx.mk b/buildroot/package/linknx/linknx.mk
similarity index 100%
rename from software/package/linknx/linknx.mk
rename to buildroot/package/linknx/linknx.mk
diff --git a/software/package/links/Config.in b/buildroot/package/links/Config.in
similarity index 100%
rename from software/package/links/Config.in
rename to buildroot/package/links/Config.in
diff --git a/software/package/links/links.hash b/buildroot/package/links/links.hash
similarity index 100%
rename from software/package/links/links.hash
rename to buildroot/package/links/links.hash
diff --git a/software/package/links/links.mk b/buildroot/package/links/links.mk
similarity index 100%
rename from software/package/links/links.mk
rename to buildroot/package/links/links.mk
diff --git a/software/package/linphone/Config.in b/buildroot/package/linphone/Config.in
similarity index 100%
rename from software/package/linphone/Config.in
rename to buildroot/package/linphone/Config.in
diff --git a/software/package/linphone/linphone.hash b/buildroot/package/linphone/linphone.hash
similarity index 100%
rename from software/package/linphone/linphone.hash
rename to buildroot/package/linphone/linphone.hash
diff --git a/software/package/linphone/linphone.mk b/buildroot/package/linphone/linphone.mk
similarity index 100%
rename from software/package/linphone/linphone.mk
rename to buildroot/package/linphone/linphone.mk
diff --git a/software/package/linux-backports/Config.in b/buildroot/package/linux-backports/Config.in
similarity index 100%
rename from software/package/linux-backports/Config.in
rename to buildroot/package/linux-backports/Config.in
diff --git a/software/package/linux-backports/linux-backports.hash b/buildroot/package/linux-backports/linux-backports.hash
similarity index 100%
rename from software/package/linux-backports/linux-backports.hash
rename to buildroot/package/linux-backports/linux-backports.hash
diff --git a/software/package/linux-backports/linux-backports.mk b/buildroot/package/linux-backports/linux-backports.mk
similarity index 100%
rename from software/package/linux-backports/linux-backports.mk
rename to buildroot/package/linux-backports/linux-backports.mk
diff --git a/software/package/linux-firmware/Config.in b/buildroot/package/linux-firmware/Config.in
similarity index 100%
rename from software/package/linux-firmware/Config.in
rename to buildroot/package/linux-firmware/Config.in
diff --git a/software/package/linux-firmware/linux-firmware.hash b/buildroot/package/linux-firmware/linux-firmware.hash
similarity index 100%
rename from software/package/linux-firmware/linux-firmware.hash
rename to buildroot/package/linux-firmware/linux-firmware.hash
diff --git a/software/package/linux-firmware/linux-firmware.mk b/buildroot/package/linux-firmware/linux-firmware.mk
similarity index 100%
rename from software/package/linux-firmware/linux-firmware.mk
rename to buildroot/package/linux-firmware/linux-firmware.mk
diff --git a/software/package/linux-fusion/0001-fix-for-linux-4-and-above.patch b/buildroot/package/linux-fusion/0001-fix-for-linux-4-and-above.patch
similarity index 100%
rename from software/package/linux-fusion/0001-fix-for-linux-4-and-above.patch
rename to buildroot/package/linux-fusion/0001-fix-for-linux-4-and-above.patch
diff --git a/software/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch b/buildroot/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch
similarity index 100%
rename from software/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch
rename to buildroot/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch
diff --git a/software/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch b/buildroot/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch
similarity index 100%
rename from software/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch
rename to buildroot/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch
diff --git a/software/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch b/buildroot/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch
similarity index 100%
rename from software/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch
rename to buildroot/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch
diff --git a/software/package/linux-fusion/40-fusion.rules b/buildroot/package/linux-fusion/40-fusion.rules
similarity index 100%
rename from software/package/linux-fusion/40-fusion.rules
rename to buildroot/package/linux-fusion/40-fusion.rules
diff --git a/software/package/linux-fusion/Config.in b/buildroot/package/linux-fusion/Config.in
similarity index 100%
rename from software/package/linux-fusion/Config.in
rename to buildroot/package/linux-fusion/Config.in
diff --git a/software/package/linux-fusion/linux-fusion.hash b/buildroot/package/linux-fusion/linux-fusion.hash
similarity index 100%
rename from software/package/linux-fusion/linux-fusion.hash
rename to buildroot/package/linux-fusion/linux-fusion.hash
diff --git a/software/package/linux-fusion/linux-fusion.mk b/buildroot/package/linux-fusion/linux-fusion.mk
similarity index 100%
rename from software/package/linux-fusion/linux-fusion.mk
rename to buildroot/package/linux-fusion/linux-fusion.mk
diff --git a/software/package/linux-headers/Config.in b/buildroot/package/linux-headers/Config.in
similarity index 100%
rename from software/package/linux-headers/Config.in
rename to buildroot/package/linux-headers/Config.in
diff --git a/software/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host
similarity index 100%
rename from software/package/linux-headers/Config.in.host
rename to buildroot/package/linux-headers/Config.in.host
diff --git a/software/package/linux-headers/linux-headers.hash b/buildroot/package/linux-headers/linux-headers.hash
similarity index 100%
rename from software/package/linux-headers/linux-headers.hash
rename to buildroot/package/linux-headers/linux-headers.hash
diff --git a/software/package/linux-headers/linux-headers.mk b/buildroot/package/linux-headers/linux-headers.mk
similarity index 100%
rename from software/package/linux-headers/linux-headers.mk
rename to buildroot/package/linux-headers/linux-headers.mk
diff --git a/software/package/linux-pam/0001-doc-makefile-am.patch b/buildroot/package/linux-pam/0001-doc-makefile-am.patch
similarity index 100%
rename from software/package/linux-pam/0001-doc-makefile-am.patch
rename to buildroot/package/linux-pam/0001-doc-makefile-am.patch
diff --git a/software/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch b/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch
similarity index 100%
rename from software/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch
rename to buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch
diff --git a/software/package/linux-pam/Config.in b/buildroot/package/linux-pam/Config.in
similarity index 100%
rename from software/package/linux-pam/Config.in
rename to buildroot/package/linux-pam/Config.in
diff --git a/software/package/linux-pam/linux-pam.hash b/buildroot/package/linux-pam/linux-pam.hash
similarity index 100%
rename from software/package/linux-pam/linux-pam.hash
rename to buildroot/package/linux-pam/linux-pam.hash
diff --git a/software/package/linux-pam/linux-pam.mk b/buildroot/package/linux-pam/linux-pam.mk
similarity index 100%
rename from software/package/linux-pam/linux-pam.mk
rename to buildroot/package/linux-pam/linux-pam.mk
diff --git a/software/package/linux-pam/login.pam b/buildroot/package/linux-pam/login.pam
similarity index 100%
rename from software/package/linux-pam/login.pam
rename to buildroot/package/linux-pam/login.pam
diff --git a/software/package/linux-pam/other.pam b/buildroot/package/linux-pam/other.pam
similarity index 100%
rename from software/package/linux-pam/other.pam
rename to buildroot/package/linux-pam/other.pam
diff --git a/software/package/linux-serial-test/Config.in b/buildroot/package/linux-serial-test/Config.in
similarity index 100%
rename from software/package/linux-serial-test/Config.in
rename to buildroot/package/linux-serial-test/Config.in
diff --git a/software/package/linux-serial-test/linux-serial-test.hash b/buildroot/package/linux-serial-test/linux-serial-test.hash
similarity index 100%
rename from software/package/linux-serial-test/linux-serial-test.hash
rename to buildroot/package/linux-serial-test/linux-serial-test.hash
diff --git a/software/package/linux-serial-test/linux-serial-test.mk b/buildroot/package/linux-serial-test/linux-serial-test.mk
similarity index 100%
rename from software/package/linux-serial-test/linux-serial-test.mk
rename to buildroot/package/linux-serial-test/linux-serial-test.mk
diff --git a/software/package/linux-syscall-support/Config.in b/buildroot/package/linux-syscall-support/Config.in
similarity index 100%
rename from software/package/linux-syscall-support/Config.in
rename to buildroot/package/linux-syscall-support/Config.in
diff --git a/software/package/linux-syscall-support/linux-syscall-support.hash b/buildroot/package/linux-syscall-support/linux-syscall-support.hash
similarity index 100%
rename from software/package/linux-syscall-support/linux-syscall-support.hash
rename to buildroot/package/linux-syscall-support/linux-syscall-support.hash
diff --git a/software/package/linux-syscall-support/linux-syscall-support.mk b/buildroot/package/linux-syscall-support/linux-syscall-support.mk
similarity index 100%
rename from software/package/linux-syscall-support/linux-syscall-support.mk
rename to buildroot/package/linux-syscall-support/linux-syscall-support.mk
diff --git a/software/package/linux-tools/Config.in b/buildroot/package/linux-tools/Config.in
similarity index 100%
rename from software/package/linux-tools/Config.in
rename to buildroot/package/linux-tools/Config.in
diff --git a/software/package/linux-tools/S10hyperv b/buildroot/package/linux-tools/S10hyperv
similarity index 100%
rename from software/package/linux-tools/S10hyperv
rename to buildroot/package/linux-tools/S10hyperv
diff --git a/software/package/linux-tools/hypervfcopyd.service b/buildroot/package/linux-tools/hypervfcopyd.service
similarity index 100%
rename from software/package/linux-tools/hypervfcopyd.service
rename to buildroot/package/linux-tools/hypervfcopyd.service
diff --git a/software/package/linux-tools/hypervkvpd.service b/buildroot/package/linux-tools/hypervkvpd.service
similarity index 100%
rename from software/package/linux-tools/hypervkvpd.service
rename to buildroot/package/linux-tools/hypervkvpd.service
diff --git a/software/package/linux-tools/hypervvssd.service b/buildroot/package/linux-tools/hypervvssd.service
similarity index 100%
rename from software/package/linux-tools/hypervvssd.service
rename to buildroot/package/linux-tools/hypervvssd.service
diff --git a/software/package/linux-tools/linux-tool-cpupower.mk.in b/buildroot/package/linux-tools/linux-tool-cpupower.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-cpupower.mk.in
rename to buildroot/package/linux-tools/linux-tool-cpupower.mk.in
diff --git a/software/package/linux-tools/linux-tool-gpio.mk.in b/buildroot/package/linux-tools/linux-tool-gpio.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-gpio.mk.in
rename to buildroot/package/linux-tools/linux-tool-gpio.mk.in
diff --git a/software/package/linux-tools/linux-tool-hv.mk.in b/buildroot/package/linux-tools/linux-tool-hv.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-hv.mk.in
rename to buildroot/package/linux-tools/linux-tool-hv.mk.in
diff --git a/software/package/linux-tools/linux-tool-iio.mk.in b/buildroot/package/linux-tools/linux-tool-iio.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-iio.mk.in
rename to buildroot/package/linux-tools/linux-tool-iio.mk.in
diff --git a/software/package/linux-tools/linux-tool-pci.mk.in b/buildroot/package/linux-tools/linux-tool-pci.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-pci.mk.in
rename to buildroot/package/linux-tools/linux-tool-pci.mk.in
diff --git a/software/package/linux-tools/linux-tool-perf.mk.in b/buildroot/package/linux-tools/linux-tool-perf.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-perf.mk.in
rename to buildroot/package/linux-tools/linux-tool-perf.mk.in
diff --git a/software/package/linux-tools/linux-tool-selftests.mk.in b/buildroot/package/linux-tools/linux-tool-selftests.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-selftests.mk.in
rename to buildroot/package/linux-tools/linux-tool-selftests.mk.in
diff --git a/software/package/linux-tools/linux-tool-tmon.mk.in b/buildroot/package/linux-tools/linux-tool-tmon.mk.in
similarity index 100%
rename from software/package/linux-tools/linux-tool-tmon.mk.in
rename to buildroot/package/linux-tools/linux-tool-tmon.mk.in
diff --git a/software/package/linux-tools/linux-tools.mk b/buildroot/package/linux-tools/linux-tools.mk
similarity index 100%
rename from software/package/linux-tools/linux-tools.mk
rename to buildroot/package/linux-tools/linux-tools.mk
diff --git a/software/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch b/buildroot/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch
similarity index 100%
rename from software/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch
rename to buildroot/package/linux-zigbee/0001-test-serial-Remove-test-serial.patch
diff --git a/software/package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/buildroot/package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
similarity index 100%
rename from software/package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
rename to buildroot/package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
diff --git a/software/package/linux-zigbee/Config.in b/buildroot/package/linux-zigbee/Config.in
similarity index 100%
rename from software/package/linux-zigbee/Config.in
rename to buildroot/package/linux-zigbee/Config.in
diff --git a/software/package/linux-zigbee/linux-zigbee.hash b/buildroot/package/linux-zigbee/linux-zigbee.hash
similarity index 100%
rename from software/package/linux-zigbee/linux-zigbee.hash
rename to buildroot/package/linux-zigbee/linux-zigbee.hash
diff --git a/software/package/linux-zigbee/linux-zigbee.mk b/buildroot/package/linux-zigbee/linux-zigbee.mk
similarity index 100%
rename from software/package/linux-zigbee/linux-zigbee.mk
rename to buildroot/package/linux-zigbee/linux-zigbee.mk
diff --git a/software/package/linuxconsoletools/0001-conditional-build.patch b/buildroot/package/linuxconsoletools/0001-conditional-build.patch
similarity index 100%
rename from software/package/linuxconsoletools/0001-conditional-build.patch
rename to buildroot/package/linuxconsoletools/0001-conditional-build.patch
diff --git a/software/package/linuxconsoletools/Config.in b/buildroot/package/linuxconsoletools/Config.in
similarity index 100%
rename from software/package/linuxconsoletools/Config.in
rename to buildroot/package/linuxconsoletools/Config.in
diff --git a/software/package/linuxconsoletools/linuxconsoletools.hash b/buildroot/package/linuxconsoletools/linuxconsoletools.hash
similarity index 100%
rename from software/package/linuxconsoletools/linuxconsoletools.hash
rename to buildroot/package/linuxconsoletools/linuxconsoletools.hash
diff --git a/software/package/linuxconsoletools/linuxconsoletools.mk b/buildroot/package/linuxconsoletools/linuxconsoletools.mk
similarity index 100%
rename from software/package/linuxconsoletools/linuxconsoletools.mk
rename to buildroot/package/linuxconsoletools/linuxconsoletools.mk
diff --git a/software/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch b/buildroot/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch
similarity index 100%
rename from software/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch
rename to buildroot/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch
diff --git a/software/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch b/buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch
similarity index 100%
rename from software/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch
rename to buildroot/package/linuxptp/0002-fix-building-with-new-kernel-headers.patch
diff --git a/software/package/linuxptp/Config.in b/buildroot/package/linuxptp/Config.in
similarity index 100%
rename from software/package/linuxptp/Config.in
rename to buildroot/package/linuxptp/Config.in
diff --git a/software/package/linuxptp/S65linuxptp b/buildroot/package/linuxptp/S65linuxptp
similarity index 100%
rename from software/package/linuxptp/S65linuxptp
rename to buildroot/package/linuxptp/S65linuxptp
diff --git a/software/package/linuxptp/linuxptp-system-clock.service b/buildroot/package/linuxptp/linuxptp-system-clock.service
similarity index 100%
rename from software/package/linuxptp/linuxptp-system-clock.service
rename to buildroot/package/linuxptp/linuxptp-system-clock.service
diff --git a/software/package/linuxptp/linuxptp.cfg b/buildroot/package/linuxptp/linuxptp.cfg
similarity index 100%
rename from software/package/linuxptp/linuxptp.cfg
rename to buildroot/package/linuxptp/linuxptp.cfg
diff --git a/software/package/linuxptp/linuxptp.hash b/buildroot/package/linuxptp/linuxptp.hash
similarity index 100%
rename from software/package/linuxptp/linuxptp.hash
rename to buildroot/package/linuxptp/linuxptp.hash
diff --git a/software/package/linuxptp/linuxptp.mk b/buildroot/package/linuxptp/linuxptp.mk
similarity index 100%
rename from software/package/linuxptp/linuxptp.mk
rename to buildroot/package/linuxptp/linuxptp.mk
diff --git a/software/package/linuxptp/linuxptp.service b/buildroot/package/linuxptp/linuxptp.service
similarity index 100%
rename from software/package/linuxptp/linuxptp.service
rename to buildroot/package/linuxptp/linuxptp.service
diff --git a/software/package/liquid-dsp/Config.in b/buildroot/package/liquid-dsp/Config.in
similarity index 100%
rename from software/package/liquid-dsp/Config.in
rename to buildroot/package/liquid-dsp/Config.in
diff --git a/software/package/liquid-dsp/liquid-dsp.hash b/buildroot/package/liquid-dsp/liquid-dsp.hash
similarity index 100%
rename from software/package/liquid-dsp/liquid-dsp.hash
rename to buildroot/package/liquid-dsp/liquid-dsp.hash
diff --git a/software/package/liquid-dsp/liquid-dsp.mk b/buildroot/package/liquid-dsp/liquid-dsp.mk
similarity index 100%
rename from software/package/liquid-dsp/liquid-dsp.mk
rename to buildroot/package/liquid-dsp/liquid-dsp.mk
diff --git a/software/package/lirc-tools/0001-Fix-build-without-Python.patch b/buildroot/package/lirc-tools/0001-Fix-build-without-Python.patch
similarity index 100%
rename from software/package/lirc-tools/0001-Fix-build-without-Python.patch
rename to buildroot/package/lirc-tools/0001-Fix-build-without-Python.patch
diff --git a/software/package/lirc-tools/0002-Fix-python-client-cross-compile.patch b/buildroot/package/lirc-tools/0002-Fix-python-client-cross-compile.patch
similarity index 100%
rename from software/package/lirc-tools/0002-Fix-python-client-cross-compile.patch
rename to buildroot/package/lirc-tools/0002-Fix-python-client-cross-compile.patch
diff --git a/software/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch b/buildroot/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch
similarity index 100%
rename from software/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch
rename to buildroot/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch
diff --git a/software/package/lirc-tools/Config.in b/buildroot/package/lirc-tools/Config.in
similarity index 100%
rename from software/package/lirc-tools/Config.in
rename to buildroot/package/lirc-tools/Config.in
diff --git a/software/package/lirc-tools/S25lircd b/buildroot/package/lirc-tools/S25lircd
similarity index 100%
rename from software/package/lirc-tools/S25lircd
rename to buildroot/package/lirc-tools/S25lircd
diff --git a/software/package/lirc-tools/lirc-tools.hash b/buildroot/package/lirc-tools/lirc-tools.hash
similarity index 100%
rename from software/package/lirc-tools/lirc-tools.hash
rename to buildroot/package/lirc-tools/lirc-tools.hash
diff --git a/software/package/lirc-tools/lirc-tools.mk b/buildroot/package/lirc-tools/lirc-tools.mk
similarity index 100%
rename from software/package/lirc-tools/lirc-tools.mk
rename to buildroot/package/lirc-tools/lirc-tools.mk
diff --git a/software/package/lite/0001-dfbspy-stat.patch b/buildroot/package/lite/0001-dfbspy-stat.patch
similarity index 100%
rename from software/package/lite/0001-dfbspy-stat.patch
rename to buildroot/package/lite/0001-dfbspy-stat.patch
diff --git a/software/package/lite/0002-no-tests.patch b/buildroot/package/lite/0002-no-tests.patch
similarity index 100%
rename from software/package/lite/0002-no-tests.patch
rename to buildroot/package/lite/0002-no-tests.patch
diff --git a/software/package/lite/0003-pkg-config.patch b/buildroot/package/lite/0003-pkg-config.patch
similarity index 100%
rename from software/package/lite/0003-pkg-config.patch
rename to buildroot/package/lite/0003-pkg-config.patch
diff --git a/software/package/lite/Config.in b/buildroot/package/lite/Config.in
similarity index 100%
rename from software/package/lite/Config.in
rename to buildroot/package/lite/Config.in
diff --git a/software/package/lite/lite.hash b/buildroot/package/lite/lite.hash
similarity index 100%
rename from software/package/lite/lite.hash
rename to buildroot/package/lite/lite.hash
diff --git a/software/package/lite/lite.mk b/buildroot/package/lite/lite.mk
similarity index 100%
rename from software/package/lite/lite.mk
rename to buildroot/package/lite/lite.mk
diff --git a/software/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch b/buildroot/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
similarity index 100%
rename from software/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
rename to buildroot/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
diff --git a/software/package/live555/Config.in b/buildroot/package/live555/Config.in
similarity index 100%
rename from software/package/live555/Config.in
rename to buildroot/package/live555/Config.in
diff --git a/software/package/live555/live555.hash b/buildroot/package/live555/live555.hash
similarity index 100%
rename from software/package/live555/live555.hash
rename to buildroot/package/live555/live555.hash
diff --git a/software/package/live555/live555.mk b/buildroot/package/live555/live555.mk
similarity index 100%
rename from software/package/live555/live555.mk
rename to buildroot/package/live555/live555.mk
diff --git a/software/package/ljlinenoise/Config.in b/buildroot/package/ljlinenoise/Config.in
similarity index 100%
rename from software/package/ljlinenoise/Config.in
rename to buildroot/package/ljlinenoise/Config.in
diff --git a/software/package/ljlinenoise/ljlinenoise.hash b/buildroot/package/ljlinenoise/ljlinenoise.hash
similarity index 100%
rename from software/package/ljlinenoise/ljlinenoise.hash
rename to buildroot/package/ljlinenoise/ljlinenoise.hash
diff --git a/software/package/ljlinenoise/ljlinenoise.mk b/buildroot/package/ljlinenoise/ljlinenoise.mk
similarity index 100%
rename from software/package/ljlinenoise/ljlinenoise.mk
rename to buildroot/package/ljlinenoise/ljlinenoise.mk
diff --git a/software/package/ljsyscall/Config.in b/buildroot/package/ljsyscall/Config.in
similarity index 100%
rename from software/package/ljsyscall/Config.in
rename to buildroot/package/ljsyscall/Config.in
diff --git a/software/package/ljsyscall/ljsyscall.hash b/buildroot/package/ljsyscall/ljsyscall.hash
similarity index 100%
rename from software/package/ljsyscall/ljsyscall.hash
rename to buildroot/package/ljsyscall/ljsyscall.hash
diff --git a/software/package/ljsyscall/ljsyscall.mk b/buildroot/package/ljsyscall/ljsyscall.mk
similarity index 100%
rename from software/package/ljsyscall/ljsyscall.mk
rename to buildroot/package/ljsyscall/ljsyscall.mk
diff --git a/software/package/lksctp-tools/Config.in b/buildroot/package/lksctp-tools/Config.in
similarity index 100%
rename from software/package/lksctp-tools/Config.in
rename to buildroot/package/lksctp-tools/Config.in
diff --git a/software/package/lksctp-tools/lksctp-tools.hash b/buildroot/package/lksctp-tools/lksctp-tools.hash
similarity index 100%
rename from software/package/lksctp-tools/lksctp-tools.hash
rename to buildroot/package/lksctp-tools/lksctp-tools.hash
diff --git a/software/package/lksctp-tools/lksctp-tools.mk b/buildroot/package/lksctp-tools/lksctp-tools.mk
similarity index 100%
rename from software/package/lksctp-tools/lksctp-tools.mk
rename to buildroot/package/lksctp-tools/lksctp-tools.mk
diff --git a/software/package/lld/Config.in.host b/buildroot/package/lld/Config.in.host
similarity index 100%
rename from software/package/lld/Config.in.host
rename to buildroot/package/lld/Config.in.host
diff --git a/software/package/lld/lld.hash b/buildroot/package/lld/lld.hash
similarity index 100%
rename from software/package/lld/lld.hash
rename to buildroot/package/lld/lld.hash
diff --git a/software/package/lld/lld.mk b/buildroot/package/lld/lld.mk
similarity index 100%
rename from software/package/lld/lld.mk
rename to buildroot/package/lld/lld.mk
diff --git a/software/package/lldpd/Config.in b/buildroot/package/lldpd/Config.in
similarity index 100%
rename from software/package/lldpd/Config.in
rename to buildroot/package/lldpd/Config.in
diff --git a/software/package/lldpd/S60lldpd b/buildroot/package/lldpd/S60lldpd
similarity index 100%
rename from software/package/lldpd/S60lldpd
rename to buildroot/package/lldpd/S60lldpd
diff --git a/software/package/lldpd/lldpd.hash b/buildroot/package/lldpd/lldpd.hash
similarity index 100%
rename from software/package/lldpd/lldpd.hash
rename to buildroot/package/lldpd/lldpd.hash
diff --git a/software/package/lldpd/lldpd.mk b/buildroot/package/lldpd/lldpd.mk
similarity index 100%
rename from software/package/lldpd/lldpd.mk
rename to buildroot/package/lldpd/lldpd.mk
diff --git a/software/package/llvm/Config.in b/buildroot/package/llvm/Config.in
similarity index 100%
rename from software/package/llvm/Config.in
rename to buildroot/package/llvm/Config.in
diff --git a/software/package/llvm/llvm.hash b/buildroot/package/llvm/llvm.hash
similarity index 100%
rename from software/package/llvm/llvm.hash
rename to buildroot/package/llvm/llvm.hash
diff --git a/software/package/llvm/llvm.mk b/buildroot/package/llvm/llvm.mk
similarity index 100%
rename from software/package/llvm/llvm.mk
rename to buildroot/package/llvm/llvm.mk
diff --git a/software/package/lm-sensors/0001-static-build.patch b/buildroot/package/lm-sensors/0001-static-build.patch
similarity index 100%
rename from software/package/lm-sensors/0001-static-build.patch
rename to buildroot/package/lm-sensors/0001-static-build.patch
diff --git a/software/package/lm-sensors/0002-no-host-ldconfig.patch b/buildroot/package/lm-sensors/0002-no-host-ldconfig.patch
similarity index 100%
rename from software/package/lm-sensors/0002-no-host-ldconfig.patch
rename to buildroot/package/lm-sensors/0002-no-host-ldconfig.patch
diff --git a/software/package/lm-sensors/Config.in b/buildroot/package/lm-sensors/Config.in
similarity index 100%
rename from software/package/lm-sensors/Config.in
rename to buildroot/package/lm-sensors/Config.in
diff --git a/software/package/lm-sensors/lm-sensors.hash b/buildroot/package/lm-sensors/lm-sensors.hash
similarity index 100%
rename from software/package/lm-sensors/lm-sensors.hash
rename to buildroot/package/lm-sensors/lm-sensors.hash
diff --git a/software/package/lm-sensors/lm-sensors.mk b/buildroot/package/lm-sensors/lm-sensors.mk
similarity index 100%
rename from software/package/lm-sensors/lm-sensors.mk
rename to buildroot/package/lm-sensors/lm-sensors.mk
diff --git a/software/package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch b/buildroot/package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch
similarity index 100%
rename from software/package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch
rename to buildroot/package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch
diff --git a/software/package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch b/buildroot/package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch
similarity index 100%
rename from software/package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch
rename to buildroot/package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch
diff --git a/software/package/lmbench/Config.in b/buildroot/package/lmbench/Config.in
similarity index 100%
rename from software/package/lmbench/Config.in
rename to buildroot/package/lmbench/Config.in
diff --git a/software/package/lmbench/lmbench.hash b/buildroot/package/lmbench/lmbench.hash
similarity index 100%
rename from software/package/lmbench/lmbench.hash
rename to buildroot/package/lmbench/lmbench.hash
diff --git a/software/package/lmbench/lmbench.mk b/buildroot/package/lmbench/lmbench.mk
similarity index 100%
rename from software/package/lmbench/lmbench.mk
rename to buildroot/package/lmbench/lmbench.mk
diff --git a/software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch
similarity index 100%
rename from software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch
rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch
diff --git a/software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
similarity index 100%
rename from software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
diff --git a/software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch
similarity index 100%
rename from software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch
rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch
diff --git a/software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash
similarity index 100%
rename from software/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash
rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash
diff --git a/software/package/localedef/localedef.hash b/buildroot/package/localedef/localedef.hash
similarity index 100%
rename from software/package/localedef/localedef.hash
rename to buildroot/package/localedef/localedef.hash
diff --git a/software/package/localedef/localedef.mk b/buildroot/package/localedef/localedef.mk
similarity index 100%
rename from software/package/localedef/localedef.mk
rename to buildroot/package/localedef/localedef.mk
diff --git a/software/package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch b/buildroot/package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch
similarity index 100%
rename from software/package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch
rename to buildroot/package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch
diff --git a/software/package/lockdev/Config.in b/buildroot/package/lockdev/Config.in
similarity index 100%
rename from software/package/lockdev/Config.in
rename to buildroot/package/lockdev/Config.in
diff --git a/software/package/lockdev/lockdev.hash b/buildroot/package/lockdev/lockdev.hash
similarity index 100%
rename from software/package/lockdev/lockdev.hash
rename to buildroot/package/lockdev/lockdev.hash
diff --git a/software/package/lockdev/lockdev.mk b/buildroot/package/lockdev/lockdev.mk
similarity index 100%
rename from software/package/lockdev/lockdev.mk
rename to buildroot/package/lockdev/lockdev.mk
diff --git a/software/package/lockfile-progs/0001-sus3v-legacy.patch b/buildroot/package/lockfile-progs/0001-sus3v-legacy.patch
similarity index 100%
rename from software/package/lockfile-progs/0001-sus3v-legacy.patch
rename to buildroot/package/lockfile-progs/0001-sus3v-legacy.patch
diff --git a/software/package/lockfile-progs/Config.in b/buildroot/package/lockfile-progs/Config.in
similarity index 100%
rename from software/package/lockfile-progs/Config.in
rename to buildroot/package/lockfile-progs/Config.in
diff --git a/software/package/lockfile-progs/lockfile-progs.hash b/buildroot/package/lockfile-progs/lockfile-progs.hash
similarity index 100%
rename from software/package/lockfile-progs/lockfile-progs.hash
rename to buildroot/package/lockfile-progs/lockfile-progs.hash
diff --git a/software/package/lockfile-progs/lockfile-progs.mk b/buildroot/package/lockfile-progs/lockfile-progs.mk
similarity index 100%
rename from software/package/lockfile-progs/lockfile-progs.mk
rename to buildroot/package/lockfile-progs/lockfile-progs.mk
diff --git a/software/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch b/buildroot/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch
similarity index 100%
rename from software/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch
rename to buildroot/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch
diff --git a/software/package/log4cplus/Config.in b/buildroot/package/log4cplus/Config.in
similarity index 100%
rename from software/package/log4cplus/Config.in
rename to buildroot/package/log4cplus/Config.in
diff --git a/software/package/log4cplus/log4cplus.hash b/buildroot/package/log4cplus/log4cplus.hash
similarity index 100%
rename from software/package/log4cplus/log4cplus.hash
rename to buildroot/package/log4cplus/log4cplus.hash
diff --git a/software/package/log4cplus/log4cplus.mk b/buildroot/package/log4cplus/log4cplus.mk
similarity index 100%
rename from software/package/log4cplus/log4cplus.mk
rename to buildroot/package/log4cplus/log4cplus.mk
diff --git a/software/package/log4cpp/Config.in b/buildroot/package/log4cpp/Config.in
similarity index 100%
rename from software/package/log4cpp/Config.in
rename to buildroot/package/log4cpp/Config.in
diff --git a/software/package/log4cpp/log4cpp.hash b/buildroot/package/log4cpp/log4cpp.hash
similarity index 100%
rename from software/package/log4cpp/log4cpp.hash
rename to buildroot/package/log4cpp/log4cpp.hash
diff --git a/software/package/log4cpp/log4cpp.mk b/buildroot/package/log4cpp/log4cpp.mk
similarity index 100%
rename from software/package/log4cpp/log4cpp.mk
rename to buildroot/package/log4cpp/log4cpp.mk
diff --git a/software/package/log4cxx/0001-charset-fixes.patch b/buildroot/package/log4cxx/0001-charset-fixes.patch
similarity index 100%
rename from software/package/log4cxx/0001-charset-fixes.patch
rename to buildroot/package/log4cxx/0001-charset-fixes.patch
diff --git a/software/package/log4cxx/0002-missing-includes.patch b/buildroot/package/log4cxx/0002-missing-includes.patch
similarity index 100%
rename from software/package/log4cxx/0002-missing-includes.patch
rename to buildroot/package/log4cxx/0002-missing-includes.patch
diff --git a/software/package/log4cxx/0003-missing-includes.patch b/buildroot/package/log4cxx/0003-missing-includes.patch
similarity index 100%
rename from software/package/log4cxx/0003-missing-includes.patch
rename to buildroot/package/log4cxx/0003-missing-includes.patch
diff --git a/software/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch b/buildroot/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch
similarity index 100%
rename from software/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch
rename to buildroot/package/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch
diff --git a/software/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch b/buildroot/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch
similarity index 100%
rename from software/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch
rename to buildroot/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch
diff --git a/software/package/log4cxx/Config.in b/buildroot/package/log4cxx/Config.in
similarity index 100%
rename from software/package/log4cxx/Config.in
rename to buildroot/package/log4cxx/Config.in
diff --git a/software/package/log4cxx/log4cxx.hash b/buildroot/package/log4cxx/log4cxx.hash
similarity index 100%
rename from software/package/log4cxx/log4cxx.hash
rename to buildroot/package/log4cxx/log4cxx.hash
diff --git a/software/package/log4cxx/log4cxx.mk b/buildroot/package/log4cxx/log4cxx.mk
similarity index 100%
rename from software/package/log4cxx/log4cxx.mk
rename to buildroot/package/log4cxx/log4cxx.mk
diff --git a/software/package/logrotate/Config.in b/buildroot/package/logrotate/Config.in
similarity index 100%
rename from software/package/logrotate/Config.in
rename to buildroot/package/logrotate/Config.in
diff --git a/software/package/logrotate/logrotate.conf b/buildroot/package/logrotate/logrotate.conf
similarity index 100%
rename from software/package/logrotate/logrotate.conf
rename to buildroot/package/logrotate/logrotate.conf
diff --git a/software/package/logrotate/logrotate.hash b/buildroot/package/logrotate/logrotate.hash
similarity index 100%
rename from software/package/logrotate/logrotate.hash
rename to buildroot/package/logrotate/logrotate.hash
diff --git a/software/package/logrotate/logrotate.mk b/buildroot/package/logrotate/logrotate.mk
similarity index 100%
rename from software/package/logrotate/logrotate.mk
rename to buildroot/package/logrotate/logrotate.mk
diff --git a/software/package/logsurfer/Config.in b/buildroot/package/logsurfer/Config.in
similarity index 100%
rename from software/package/logsurfer/Config.in
rename to buildroot/package/logsurfer/Config.in
diff --git a/software/package/logsurfer/logsurfer.hash b/buildroot/package/logsurfer/logsurfer.hash
similarity index 100%
rename from software/package/logsurfer/logsurfer.hash
rename to buildroot/package/logsurfer/logsurfer.hash
diff --git a/software/package/logsurfer/logsurfer.mk b/buildroot/package/logsurfer/logsurfer.mk
similarity index 100%
rename from software/package/logsurfer/logsurfer.mk
rename to buildroot/package/logsurfer/logsurfer.mk
diff --git a/software/package/lpc3250loader/Config.in.host b/buildroot/package/lpc3250loader/Config.in.host
similarity index 100%
rename from software/package/lpc3250loader/Config.in.host
rename to buildroot/package/lpc3250loader/Config.in.host
diff --git a/software/package/lpc3250loader/lpc3250loader.hash b/buildroot/package/lpc3250loader/lpc3250loader.hash
similarity index 100%
rename from software/package/lpc3250loader/lpc3250loader.hash
rename to buildroot/package/lpc3250loader/lpc3250loader.hash
diff --git a/software/package/lpc3250loader/lpc3250loader.mk b/buildroot/package/lpc3250loader/lpc3250loader.mk
similarity index 100%
rename from software/package/lpc3250loader/lpc3250loader.mk
rename to buildroot/package/lpc3250loader/lpc3250loader.mk
diff --git a/software/package/lpeg/Config.in b/buildroot/package/lpeg/Config.in
similarity index 100%
rename from software/package/lpeg/Config.in
rename to buildroot/package/lpeg/Config.in
diff --git a/software/package/lpeg/lpeg.hash b/buildroot/package/lpeg/lpeg.hash
similarity index 100%
rename from software/package/lpeg/lpeg.hash
rename to buildroot/package/lpeg/lpeg.hash
diff --git a/software/package/lpeg/lpeg.mk b/buildroot/package/lpeg/lpeg.mk
similarity index 100%
rename from software/package/lpeg/lpeg.mk
rename to buildroot/package/lpeg/lpeg.mk
diff --git a/software/package/lpty/Config.in b/buildroot/package/lpty/Config.in
similarity index 100%
rename from software/package/lpty/Config.in
rename to buildroot/package/lpty/Config.in
diff --git a/software/package/lpty/lpty.hash b/buildroot/package/lpty/lpty.hash
similarity index 100%
rename from software/package/lpty/lpty.hash
rename to buildroot/package/lpty/lpty.hash
diff --git a/software/package/lpty/lpty.mk b/buildroot/package/lpty/lpty.mk
similarity index 100%
rename from software/package/lpty/lpty.mk
rename to buildroot/package/lpty/lpty.mk
diff --git a/software/package/lrandom/Config.in b/buildroot/package/lrandom/Config.in
similarity index 100%
rename from software/package/lrandom/Config.in
rename to buildroot/package/lrandom/Config.in
diff --git a/software/package/lrandom/lrandom.hash b/buildroot/package/lrandom/lrandom.hash
similarity index 100%
rename from software/package/lrandom/lrandom.hash
rename to buildroot/package/lrandom/lrandom.hash
diff --git a/software/package/lrandom/lrandom.mk b/buildroot/package/lrandom/lrandom.mk
similarity index 100%
rename from software/package/lrandom/lrandom.mk
rename to buildroot/package/lrandom/lrandom.mk
diff --git a/software/package/lrzip/Config.in b/buildroot/package/lrzip/Config.in
similarity index 100%
rename from software/package/lrzip/Config.in
rename to buildroot/package/lrzip/Config.in
diff --git a/software/package/lrzip/lrzip.hash b/buildroot/package/lrzip/lrzip.hash
similarity index 100%
rename from software/package/lrzip/lrzip.hash
rename to buildroot/package/lrzip/lrzip.hash
diff --git a/software/package/lrzip/lrzip.mk b/buildroot/package/lrzip/lrzip.mk
similarity index 100%
rename from software/package/lrzip/lrzip.mk
rename to buildroot/package/lrzip/lrzip.mk
diff --git a/software/package/lrzsz/Config.in b/buildroot/package/lrzsz/Config.in
similarity index 100%
rename from software/package/lrzsz/Config.in
rename to buildroot/package/lrzsz/Config.in
diff --git a/software/package/lrzsz/lrzsz.hash b/buildroot/package/lrzsz/lrzsz.hash
similarity index 100%
rename from software/package/lrzsz/lrzsz.hash
rename to buildroot/package/lrzsz/lrzsz.hash
diff --git a/software/package/lrzsz/lrzsz.mk b/buildroot/package/lrzsz/lrzsz.mk
similarity index 100%
rename from software/package/lrzsz/lrzsz.mk
rename to buildroot/package/lrzsz/lrzsz.mk
diff --git a/software/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch b/buildroot/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch
similarity index 100%
rename from software/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch
rename to buildroot/package/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch
diff --git a/software/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch b/buildroot/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch
similarity index 100%
rename from software/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch
rename to buildroot/package/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch
diff --git a/software/package/lshw/0003-Fix-use-of-LONG_BIT.patch b/buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch
similarity index 100%
rename from software/package/lshw/0003-Fix-use-of-LONG_BIT.patch
rename to buildroot/package/lshw/0003-Fix-use-of-LONG_BIT.patch
diff --git a/software/package/lshw/Config.in b/buildroot/package/lshw/Config.in
similarity index 100%
rename from software/package/lshw/Config.in
rename to buildroot/package/lshw/Config.in
diff --git a/software/package/lshw/lshw.hash b/buildroot/package/lshw/lshw.hash
similarity index 100%
rename from software/package/lshw/lshw.hash
rename to buildroot/package/lshw/lshw.hash
diff --git a/software/package/lshw/lshw.mk b/buildroot/package/lshw/lshw.mk
similarity index 100%
rename from software/package/lshw/lshw.mk
rename to buildroot/package/lshw/lshw.mk
diff --git a/software/package/lsof/0001-makefile.patch b/buildroot/package/lsof/0001-makefile.patch
similarity index 100%
rename from software/package/lsof/0001-makefile.patch
rename to buildroot/package/lsof/0001-makefile.patch
diff --git a/software/package/lsof/0002-remove-susvlegacy-funcs.patch b/buildroot/package/lsof/0002-remove-susvlegacy-funcs.patch
similarity index 100%
rename from software/package/lsof/0002-remove-susvlegacy-funcs.patch
rename to buildroot/package/lsof/0002-remove-susvlegacy-funcs.patch
diff --git a/software/package/lsof/0003-override-cflags.patch b/buildroot/package/lsof/0003-override-cflags.patch
similarity index 100%
rename from software/package/lsof/0003-override-cflags.patch
rename to buildroot/package/lsof/0003-override-cflags.patch
diff --git a/software/package/lsof/Config.in b/buildroot/package/lsof/Config.in
similarity index 100%
rename from software/package/lsof/Config.in
rename to buildroot/package/lsof/Config.in
diff --git a/software/package/lsof/lsof.hash b/buildroot/package/lsof/lsof.hash
similarity index 100%
rename from software/package/lsof/lsof.hash
rename to buildroot/package/lsof/lsof.hash
diff --git a/software/package/lsof/lsof.mk b/buildroot/package/lsof/lsof.mk
similarity index 100%
rename from software/package/lsof/lsof.mk
rename to buildroot/package/lsof/lsof.mk
diff --git a/software/package/lsqlite3/Config.in b/buildroot/package/lsqlite3/Config.in
similarity index 100%
rename from software/package/lsqlite3/Config.in
rename to buildroot/package/lsqlite3/Config.in
diff --git a/software/package/lsqlite3/lsqlite3.hash b/buildroot/package/lsqlite3/lsqlite3.hash
similarity index 100%
rename from software/package/lsqlite3/lsqlite3.hash
rename to buildroot/package/lsqlite3/lsqlite3.hash
diff --git a/software/package/lsqlite3/lsqlite3.mk b/buildroot/package/lsqlite3/lsqlite3.mk
similarity index 100%
rename from software/package/lsqlite3/lsqlite3.mk
rename to buildroot/package/lsqlite3/lsqlite3.mk
diff --git a/software/package/lsscsi/Config.in b/buildroot/package/lsscsi/Config.in
similarity index 100%
rename from software/package/lsscsi/Config.in
rename to buildroot/package/lsscsi/Config.in
diff --git a/software/package/lsscsi/lsscsi.hash b/buildroot/package/lsscsi/lsscsi.hash
similarity index 100%
rename from software/package/lsscsi/lsscsi.hash
rename to buildroot/package/lsscsi/lsscsi.hash
diff --git a/software/package/lsscsi/lsscsi.mk b/buildroot/package/lsscsi/lsscsi.mk
similarity index 100%
rename from software/package/lsscsi/lsscsi.mk
rename to buildroot/package/lsscsi/lsscsi.mk
diff --git a/software/package/lsuio/Config.in b/buildroot/package/lsuio/Config.in
similarity index 100%
rename from software/package/lsuio/Config.in
rename to buildroot/package/lsuio/Config.in
diff --git a/software/package/lsuio/lsuio.hash b/buildroot/package/lsuio/lsuio.hash
similarity index 100%
rename from software/package/lsuio/lsuio.hash
rename to buildroot/package/lsuio/lsuio.hash
diff --git a/software/package/lsuio/lsuio.mk b/buildroot/package/lsuio/lsuio.mk
similarity index 100%
rename from software/package/lsuio/lsuio.mk
rename to buildroot/package/lsuio/lsuio.mk
diff --git a/software/package/ltp-testsuite/Config.in b/buildroot/package/ltp-testsuite/Config.in
similarity index 100%
rename from software/package/ltp-testsuite/Config.in
rename to buildroot/package/ltp-testsuite/Config.in
diff --git a/software/package/ltp-testsuite/ltp-testsuite.hash b/buildroot/package/ltp-testsuite/ltp-testsuite.hash
similarity index 100%
rename from software/package/ltp-testsuite/ltp-testsuite.hash
rename to buildroot/package/ltp-testsuite/ltp-testsuite.hash
diff --git a/software/package/ltp-testsuite/ltp-testsuite.mk b/buildroot/package/ltp-testsuite/ltp-testsuite.mk
similarity index 100%
rename from software/package/ltp-testsuite/ltp-testsuite.mk
rename to buildroot/package/ltp-testsuite/ltp-testsuite.mk
diff --git a/software/package/ltrace/0001-arm-plt.patch b/buildroot/package/ltrace/0001-arm-plt.patch
similarity index 100%
rename from software/package/ltrace/0001-arm-plt.patch
rename to buildroot/package/ltrace/0001-arm-plt.patch
diff --git a/software/package/ltrace/0002-sparc-add-missing-library.h-include.patch b/buildroot/package/ltrace/0002-sparc-add-missing-library.h-include.patch
similarity index 100%
rename from software/package/ltrace/0002-sparc-add-missing-library.h-include.patch
rename to buildroot/package/ltrace/0002-sparc-add-missing-library.h-include.patch
diff --git a/software/package/ltrace/Config.in b/buildroot/package/ltrace/Config.in
similarity index 100%
rename from software/package/ltrace/Config.in
rename to buildroot/package/ltrace/Config.in
diff --git a/software/package/ltrace/ltrace.hash b/buildroot/package/ltrace/ltrace.hash
similarity index 100%
rename from software/package/ltrace/ltrace.hash
rename to buildroot/package/ltrace/ltrace.hash
diff --git a/software/package/ltrace/ltrace.mk b/buildroot/package/ltrace/ltrace.mk
similarity index 100%
rename from software/package/ltrace/ltrace.mk
rename to buildroot/package/ltrace/ltrace.mk
diff --git a/software/package/ltris/0001-fix-gcc5-build.patch b/buildroot/package/ltris/0001-fix-gcc5-build.patch
similarity index 100%
rename from software/package/ltris/0001-fix-gcc5-build.patch
rename to buildroot/package/ltris/0001-fix-gcc5-build.patch
diff --git a/software/package/ltris/Config.in b/buildroot/package/ltris/Config.in
similarity index 100%
rename from software/package/ltris/Config.in
rename to buildroot/package/ltris/Config.in
diff --git a/software/package/ltris/ltris.hash b/buildroot/package/ltris/ltris.hash
similarity index 100%
rename from software/package/ltris/ltris.hash
rename to buildroot/package/ltris/ltris.hash
diff --git a/software/package/ltris/ltris.mk b/buildroot/package/ltris/ltris.mk
similarity index 100%
rename from software/package/ltris/ltris.mk
rename to buildroot/package/ltris/ltris.mk
diff --git a/software/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/buildroot/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
similarity index 100%
rename from software/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
rename to buildroot/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch
diff --git a/software/package/lttng-babeltrace/Config.in b/buildroot/package/lttng-babeltrace/Config.in
similarity index 100%
rename from software/package/lttng-babeltrace/Config.in
rename to buildroot/package/lttng-babeltrace/Config.in
diff --git a/software/package/lttng-babeltrace/Config.in.host b/buildroot/package/lttng-babeltrace/Config.in.host
similarity index 100%
rename from software/package/lttng-babeltrace/Config.in.host
rename to buildroot/package/lttng-babeltrace/Config.in.host
diff --git a/software/package/lttng-babeltrace/lttng-babeltrace.hash b/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash
similarity index 100%
rename from software/package/lttng-babeltrace/lttng-babeltrace.hash
rename to buildroot/package/lttng-babeltrace/lttng-babeltrace.hash
diff --git a/software/package/lttng-babeltrace/lttng-babeltrace.mk b/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk
similarity index 100%
rename from software/package/lttng-babeltrace/lttng-babeltrace.mk
rename to buildroot/package/lttng-babeltrace/lttng-babeltrace.mk
diff --git a/software/package/lttng-libust/Config.in b/buildroot/package/lttng-libust/Config.in
similarity index 100%
rename from software/package/lttng-libust/Config.in
rename to buildroot/package/lttng-libust/Config.in
diff --git a/software/package/lttng-libust/lttng-libust.hash b/buildroot/package/lttng-libust/lttng-libust.hash
similarity index 100%
rename from software/package/lttng-libust/lttng-libust.hash
rename to buildroot/package/lttng-libust/lttng-libust.hash
diff --git a/software/package/lttng-libust/lttng-libust.mk b/buildroot/package/lttng-libust/lttng-libust.mk
similarity index 100%
rename from software/package/lttng-libust/lttng-libust.mk
rename to buildroot/package/lttng-libust/lttng-libust.mk
diff --git a/software/package/lttng-modules/Config.in b/buildroot/package/lttng-modules/Config.in
similarity index 100%
rename from software/package/lttng-modules/Config.in
rename to buildroot/package/lttng-modules/Config.in
diff --git a/software/package/lttng-modules/lttng-modules.hash b/buildroot/package/lttng-modules/lttng-modules.hash
similarity index 100%
rename from software/package/lttng-modules/lttng-modules.hash
rename to buildroot/package/lttng-modules/lttng-modules.hash
diff --git a/software/package/lttng-modules/lttng-modules.mk b/buildroot/package/lttng-modules/lttng-modules.mk
similarity index 100%
rename from software/package/lttng-modules/lttng-modules.mk
rename to buildroot/package/lttng-modules/lttng-modules.mk
diff --git a/software/package/lttng-tools/Config.in b/buildroot/package/lttng-tools/Config.in
similarity index 100%
rename from software/package/lttng-tools/Config.in
rename to buildroot/package/lttng-tools/Config.in
diff --git a/software/package/lttng-tools/lttng-tools.hash b/buildroot/package/lttng-tools/lttng-tools.hash
similarity index 100%
rename from software/package/lttng-tools/lttng-tools.hash
rename to buildroot/package/lttng-tools/lttng-tools.hash
diff --git a/software/package/lttng-tools/lttng-tools.mk b/buildroot/package/lttng-tools/lttng-tools.mk
similarity index 100%
rename from software/package/lttng-tools/lttng-tools.mk
rename to buildroot/package/lttng-tools/lttng-tools.mk
diff --git a/software/package/lua-basexx/Config.in b/buildroot/package/lua-basexx/Config.in
similarity index 100%
rename from software/package/lua-basexx/Config.in
rename to buildroot/package/lua-basexx/Config.in
diff --git a/software/package/lua-basexx/lua-basexx.hash b/buildroot/package/lua-basexx/lua-basexx.hash
similarity index 100%
rename from software/package/lua-basexx/lua-basexx.hash
rename to buildroot/package/lua-basexx/lua-basexx.hash
diff --git a/software/package/lua-basexx/lua-basexx.mk b/buildroot/package/lua-basexx/lua-basexx.mk
similarity index 100%
rename from software/package/lua-basexx/lua-basexx.mk
rename to buildroot/package/lua-basexx/lua-basexx.mk
diff --git a/software/package/lua-binaryheap/Config.in b/buildroot/package/lua-binaryheap/Config.in
similarity index 100%
rename from software/package/lua-binaryheap/Config.in
rename to buildroot/package/lua-binaryheap/Config.in
diff --git a/software/package/lua-binaryheap/lua-binaryheap.hash b/buildroot/package/lua-binaryheap/lua-binaryheap.hash
similarity index 100%
rename from software/package/lua-binaryheap/lua-binaryheap.hash
rename to buildroot/package/lua-binaryheap/lua-binaryheap.hash
diff --git a/software/package/lua-binaryheap/lua-binaryheap.mk b/buildroot/package/lua-binaryheap/lua-binaryheap.mk
similarity index 100%
rename from software/package/lua-binaryheap/lua-binaryheap.mk
rename to buildroot/package/lua-binaryheap/lua-binaryheap.mk
diff --git a/software/package/lua-bit32/Config.in b/buildroot/package/lua-bit32/Config.in
similarity index 100%
rename from software/package/lua-bit32/Config.in
rename to buildroot/package/lua-bit32/Config.in
diff --git a/software/package/lua-bit32/lua-bit32.hash b/buildroot/package/lua-bit32/lua-bit32.hash
similarity index 100%
rename from software/package/lua-bit32/lua-bit32.hash
rename to buildroot/package/lua-bit32/lua-bit32.hash
diff --git a/software/package/lua-bit32/lua-bit32.mk b/buildroot/package/lua-bit32/lua-bit32.mk
similarity index 100%
rename from software/package/lua-bit32/lua-bit32.mk
rename to buildroot/package/lua-bit32/lua-bit32.mk
diff --git a/software/package/lua-cjson/Config.in b/buildroot/package/lua-cjson/Config.in
similarity index 100%
rename from software/package/lua-cjson/Config.in
rename to buildroot/package/lua-cjson/Config.in
diff --git a/software/package/lua-cjson/lua-cjson.hash b/buildroot/package/lua-cjson/lua-cjson.hash
similarity index 100%
rename from software/package/lua-cjson/lua-cjson.hash
rename to buildroot/package/lua-cjson/lua-cjson.hash
diff --git a/software/package/lua-cjson/lua-cjson.mk b/buildroot/package/lua-cjson/lua-cjson.mk
similarity index 100%
rename from software/package/lua-cjson/lua-cjson.mk
rename to buildroot/package/lua-cjson/lua-cjson.mk
diff --git a/software/package/lua-coat/Config.in b/buildroot/package/lua-coat/Config.in
similarity index 100%
rename from software/package/lua-coat/Config.in
rename to buildroot/package/lua-coat/Config.in
diff --git a/software/package/lua-coat/lua-coat.hash b/buildroot/package/lua-coat/lua-coat.hash
similarity index 100%
rename from software/package/lua-coat/lua-coat.hash
rename to buildroot/package/lua-coat/lua-coat.hash
diff --git a/software/package/lua-coat/lua-coat.mk b/buildroot/package/lua-coat/lua-coat.mk
similarity index 100%
rename from software/package/lua-coat/lua-coat.mk
rename to buildroot/package/lua-coat/lua-coat.mk
diff --git a/software/package/lua-coatpersistent/Config.in b/buildroot/package/lua-coatpersistent/Config.in
similarity index 100%
rename from software/package/lua-coatpersistent/Config.in
rename to buildroot/package/lua-coatpersistent/Config.in
diff --git a/software/package/lua-coatpersistent/lua-coatpersistent.hash b/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
similarity index 100%
rename from software/package/lua-coatpersistent/lua-coatpersistent.hash
rename to buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
diff --git a/software/package/lua-coatpersistent/lua-coatpersistent.mk b/buildroot/package/lua-coatpersistent/lua-coatpersistent.mk
similarity index 100%
rename from software/package/lua-coatpersistent/lua-coatpersistent.mk
rename to buildroot/package/lua-coatpersistent/lua-coatpersistent.mk
diff --git a/software/package/lua-codegen/Config.in b/buildroot/package/lua-codegen/Config.in
similarity index 100%
rename from software/package/lua-codegen/Config.in
rename to buildroot/package/lua-codegen/Config.in
diff --git a/software/package/lua-codegen/lua-codegen.hash b/buildroot/package/lua-codegen/lua-codegen.hash
similarity index 100%
rename from software/package/lua-codegen/lua-codegen.hash
rename to buildroot/package/lua-codegen/lua-codegen.hash
diff --git a/software/package/lua-codegen/lua-codegen.mk b/buildroot/package/lua-codegen/lua-codegen.mk
similarity index 100%
rename from software/package/lua-codegen/lua-codegen.mk
rename to buildroot/package/lua-codegen/lua-codegen.mk
diff --git a/software/package/lua-compat53/Config.in b/buildroot/package/lua-compat53/Config.in
similarity index 100%
rename from software/package/lua-compat53/Config.in
rename to buildroot/package/lua-compat53/Config.in
diff --git a/software/package/lua-compat53/lua-compat53.hash b/buildroot/package/lua-compat53/lua-compat53.hash
similarity index 100%
rename from software/package/lua-compat53/lua-compat53.hash
rename to buildroot/package/lua-compat53/lua-compat53.hash
diff --git a/software/package/lua-compat53/lua-compat53.mk b/buildroot/package/lua-compat53/lua-compat53.mk
similarity index 100%
rename from software/package/lua-compat53/lua-compat53.mk
rename to buildroot/package/lua-compat53/lua-compat53.mk
diff --git a/software/package/lua-cqueues/Config.in b/buildroot/package/lua-cqueues/Config.in
similarity index 100%
rename from software/package/lua-cqueues/Config.in
rename to buildroot/package/lua-cqueues/Config.in
diff --git a/software/package/lua-cqueues/lua-cqueues.hash b/buildroot/package/lua-cqueues/lua-cqueues.hash
similarity index 100%
rename from software/package/lua-cqueues/lua-cqueues.hash
rename to buildroot/package/lua-cqueues/lua-cqueues.hash
diff --git a/software/package/lua-cqueues/lua-cqueues.mk b/buildroot/package/lua-cqueues/lua-cqueues.mk
similarity index 100%
rename from software/package/lua-cqueues/lua-cqueues.mk
rename to buildroot/package/lua-cqueues/lua-cqueues.mk
diff --git a/software/package/lua-csnappy/Config.in b/buildroot/package/lua-csnappy/Config.in
similarity index 100%
rename from software/package/lua-csnappy/Config.in
rename to buildroot/package/lua-csnappy/Config.in
diff --git a/software/package/lua-csnappy/lua-csnappy.hash b/buildroot/package/lua-csnappy/lua-csnappy.hash
similarity index 100%
rename from software/package/lua-csnappy/lua-csnappy.hash
rename to buildroot/package/lua-csnappy/lua-csnappy.hash
diff --git a/software/package/lua-csnappy/lua-csnappy.mk b/buildroot/package/lua-csnappy/lua-csnappy.mk
similarity index 100%
rename from software/package/lua-csnappy/lua-csnappy.mk
rename to buildroot/package/lua-csnappy/lua-csnappy.mk
diff --git a/software/package/lua-curl/Config.in b/buildroot/package/lua-curl/Config.in
similarity index 100%
rename from software/package/lua-curl/Config.in
rename to buildroot/package/lua-curl/Config.in
diff --git a/software/package/lua-curl/lua-curl.hash b/buildroot/package/lua-curl/lua-curl.hash
similarity index 100%
rename from software/package/lua-curl/lua-curl.hash
rename to buildroot/package/lua-curl/lua-curl.hash
diff --git a/software/package/lua-curl/lua-curl.mk b/buildroot/package/lua-curl/lua-curl.mk
similarity index 100%
rename from software/package/lua-curl/lua-curl.mk
rename to buildroot/package/lua-curl/lua-curl.mk
diff --git a/software/package/lua-datafile/Config.in b/buildroot/package/lua-datafile/Config.in
similarity index 100%
rename from software/package/lua-datafile/Config.in
rename to buildroot/package/lua-datafile/Config.in
diff --git a/software/package/lua-datafile/lua-datafile.hash b/buildroot/package/lua-datafile/lua-datafile.hash
similarity index 100%
rename from software/package/lua-datafile/lua-datafile.hash
rename to buildroot/package/lua-datafile/lua-datafile.hash
diff --git a/software/package/lua-datafile/lua-datafile.mk b/buildroot/package/lua-datafile/lua-datafile.mk
similarity index 100%
rename from software/package/lua-datafile/lua-datafile.mk
rename to buildroot/package/lua-datafile/lua-datafile.mk
diff --git a/software/package/lua-ev/Config.in b/buildroot/package/lua-ev/Config.in
similarity index 100%
rename from software/package/lua-ev/Config.in
rename to buildroot/package/lua-ev/Config.in
diff --git a/software/package/lua-ev/lua-ev.hash b/buildroot/package/lua-ev/lua-ev.hash
similarity index 100%
rename from software/package/lua-ev/lua-ev.hash
rename to buildroot/package/lua-ev/lua-ev.hash
diff --git a/software/package/lua-ev/lua-ev.mk b/buildroot/package/lua-ev/lua-ev.mk
similarity index 100%
rename from software/package/lua-ev/lua-ev.mk
rename to buildroot/package/lua-ev/lua-ev.mk
diff --git a/software/package/lua-fifo/Config.in b/buildroot/package/lua-fifo/Config.in
similarity index 100%
rename from software/package/lua-fifo/Config.in
rename to buildroot/package/lua-fifo/Config.in
diff --git a/software/package/lua-fifo/lua-fifo.hash b/buildroot/package/lua-fifo/lua-fifo.hash
similarity index 100%
rename from software/package/lua-fifo/lua-fifo.hash
rename to buildroot/package/lua-fifo/lua-fifo.hash
diff --git a/software/package/lua-fifo/lua-fifo.mk b/buildroot/package/lua-fifo/lua-fifo.mk
similarity index 100%
rename from software/package/lua-fifo/lua-fifo.mk
rename to buildroot/package/lua-fifo/lua-fifo.mk
diff --git a/software/package/lua-flu/Config.in b/buildroot/package/lua-flu/Config.in
similarity index 100%
rename from software/package/lua-flu/Config.in
rename to buildroot/package/lua-flu/Config.in
diff --git a/software/package/lua-flu/lua-flu.hash b/buildroot/package/lua-flu/lua-flu.hash
similarity index 100%
rename from software/package/lua-flu/lua-flu.hash
rename to buildroot/package/lua-flu/lua-flu.hash
diff --git a/software/package/lua-flu/lua-flu.mk b/buildroot/package/lua-flu/lua-flu.mk
similarity index 100%
rename from software/package/lua-flu/lua-flu.mk
rename to buildroot/package/lua-flu/lua-flu.mk
diff --git a/software/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch b/buildroot/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch
similarity index 100%
rename from software/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch
rename to buildroot/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch
diff --git a/software/package/lua-gd/Config.in b/buildroot/package/lua-gd/Config.in
similarity index 100%
rename from software/package/lua-gd/Config.in
rename to buildroot/package/lua-gd/Config.in
diff --git a/software/package/lua-gd/lua-gd.hash b/buildroot/package/lua-gd/lua-gd.hash
similarity index 100%
rename from software/package/lua-gd/lua-gd.hash
rename to buildroot/package/lua-gd/lua-gd.hash
diff --git a/software/package/lua-gd/lua-gd.mk b/buildroot/package/lua-gd/lua-gd.mk
similarity index 100%
rename from software/package/lua-gd/lua-gd.mk
rename to buildroot/package/lua-gd/lua-gd.mk
diff --git a/software/package/lua-http/Config.in b/buildroot/package/lua-http/Config.in
similarity index 100%
rename from software/package/lua-http/Config.in
rename to buildroot/package/lua-http/Config.in
diff --git a/software/package/lua-http/lua-http.hash b/buildroot/package/lua-http/lua-http.hash
similarity index 100%
rename from software/package/lua-http/lua-http.hash
rename to buildroot/package/lua-http/lua-http.hash
diff --git a/software/package/lua-http/lua-http.mk b/buildroot/package/lua-http/lua-http.mk
similarity index 100%
rename from software/package/lua-http/lua-http.mk
rename to buildroot/package/lua-http/lua-http.mk
diff --git a/software/package/lua-iconv/Config.in b/buildroot/package/lua-iconv/Config.in
similarity index 100%
rename from software/package/lua-iconv/Config.in
rename to buildroot/package/lua-iconv/Config.in
diff --git a/software/package/lua-iconv/lua-iconv.hash b/buildroot/package/lua-iconv/lua-iconv.hash
similarity index 100%
rename from software/package/lua-iconv/lua-iconv.hash
rename to buildroot/package/lua-iconv/lua-iconv.hash
diff --git a/software/package/lua-iconv/lua-iconv.mk b/buildroot/package/lua-iconv/lua-iconv.mk
similarity index 100%
rename from software/package/lua-iconv/lua-iconv.mk
rename to buildroot/package/lua-iconv/lua-iconv.mk
diff --git a/software/package/lua-livr-extra/Config.in b/buildroot/package/lua-livr-extra/Config.in
similarity index 100%
rename from software/package/lua-livr-extra/Config.in
rename to buildroot/package/lua-livr-extra/Config.in
diff --git a/software/package/lua-livr-extra/lua-livr-extra.hash b/buildroot/package/lua-livr-extra/lua-livr-extra.hash
similarity index 100%
rename from software/package/lua-livr-extra/lua-livr-extra.hash
rename to buildroot/package/lua-livr-extra/lua-livr-extra.hash
diff --git a/software/package/lua-livr-extra/lua-livr-extra.mk b/buildroot/package/lua-livr-extra/lua-livr-extra.mk
similarity index 100%
rename from software/package/lua-livr-extra/lua-livr-extra.mk
rename to buildroot/package/lua-livr-extra/lua-livr-extra.mk
diff --git a/software/package/lua-livr/Config.in b/buildroot/package/lua-livr/Config.in
similarity index 100%
rename from software/package/lua-livr/Config.in
rename to buildroot/package/lua-livr/Config.in
diff --git a/software/package/lua-livr/lua-livr.hash b/buildroot/package/lua-livr/lua-livr.hash
similarity index 100%
rename from software/package/lua-livr/lua-livr.hash
rename to buildroot/package/lua-livr/lua-livr.hash
diff --git a/software/package/lua-livr/lua-livr.mk b/buildroot/package/lua-livr/lua-livr.mk
similarity index 100%
rename from software/package/lua-livr/lua-livr.mk
rename to buildroot/package/lua-livr/lua-livr.mk
diff --git a/software/package/lua-lpeg-patterns/Config.in b/buildroot/package/lua-lpeg-patterns/Config.in
similarity index 100%
rename from software/package/lua-lpeg-patterns/Config.in
rename to buildroot/package/lua-lpeg-patterns/Config.in
diff --git a/software/package/lua-lpeg-patterns/lua-lpeg-patterns.hash b/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
similarity index 100%
rename from software/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
rename to buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
diff --git a/software/package/lua-lpeg-patterns/lua-lpeg-patterns.mk b/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
similarity index 100%
rename from software/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
rename to buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
diff --git a/software/package/lua-lunitx/Config.in b/buildroot/package/lua-lunitx/Config.in
similarity index 100%
rename from software/package/lua-lunitx/Config.in
rename to buildroot/package/lua-lunitx/Config.in
diff --git a/software/package/lua-lunitx/lua-lunitx.hash b/buildroot/package/lua-lunitx/lua-lunitx.hash
similarity index 100%
rename from software/package/lua-lunitx/lua-lunitx.hash
rename to buildroot/package/lua-lunitx/lua-lunitx.hash
diff --git a/software/package/lua-lunitx/lua-lunitx.mk b/buildroot/package/lua-lunitx/lua-lunitx.mk
similarity index 100%
rename from software/package/lua-lunitx/lua-lunitx.mk
rename to buildroot/package/lua-lunitx/lua-lunitx.mk
diff --git a/software/package/lua-markdown/Config.in b/buildroot/package/lua-markdown/Config.in
similarity index 100%
rename from software/package/lua-markdown/Config.in
rename to buildroot/package/lua-markdown/Config.in
diff --git a/software/package/lua-markdown/lua-markdown.hash b/buildroot/package/lua-markdown/lua-markdown.hash
similarity index 100%
rename from software/package/lua-markdown/lua-markdown.hash
rename to buildroot/package/lua-markdown/lua-markdown.hash
diff --git a/software/package/lua-markdown/lua-markdown.mk b/buildroot/package/lua-markdown/lua-markdown.mk
similarity index 100%
rename from software/package/lua-markdown/lua-markdown.mk
rename to buildroot/package/lua-markdown/lua-markdown.mk
diff --git a/software/package/lua-messagepack/Config.in b/buildroot/package/lua-messagepack/Config.in
similarity index 100%
rename from software/package/lua-messagepack/Config.in
rename to buildroot/package/lua-messagepack/Config.in
diff --git a/software/package/lua-messagepack/lua-messagepack.hash b/buildroot/package/lua-messagepack/lua-messagepack.hash
similarity index 100%
rename from software/package/lua-messagepack/lua-messagepack.hash
rename to buildroot/package/lua-messagepack/lua-messagepack.hash
diff --git a/software/package/lua-messagepack/lua-messagepack.mk b/buildroot/package/lua-messagepack/lua-messagepack.mk
similarity index 100%
rename from software/package/lua-messagepack/lua-messagepack.mk
rename to buildroot/package/lua-messagepack/lua-messagepack.mk
diff --git a/software/package/lua-msgpack-native/Config.in b/buildroot/package/lua-msgpack-native/Config.in
similarity index 100%
rename from software/package/lua-msgpack-native/Config.in
rename to buildroot/package/lua-msgpack-native/Config.in
diff --git a/software/package/lua-msgpack-native/lua-msgpack-native.hash b/buildroot/package/lua-msgpack-native/lua-msgpack-native.hash
similarity index 100%
rename from software/package/lua-msgpack-native/lua-msgpack-native.hash
rename to buildroot/package/lua-msgpack-native/lua-msgpack-native.hash
diff --git a/software/package/lua-msgpack-native/lua-msgpack-native.mk b/buildroot/package/lua-msgpack-native/lua-msgpack-native.mk
similarity index 100%
rename from software/package/lua-msgpack-native/lua-msgpack-native.mk
rename to buildroot/package/lua-msgpack-native/lua-msgpack-native.mk
diff --git a/software/package/lua-periphery/Config.in b/buildroot/package/lua-periphery/Config.in
similarity index 100%
rename from software/package/lua-periphery/Config.in
rename to buildroot/package/lua-periphery/Config.in
diff --git a/software/package/lua-periphery/lua-periphery.hash b/buildroot/package/lua-periphery/lua-periphery.hash
similarity index 100%
rename from software/package/lua-periphery/lua-periphery.hash
rename to buildroot/package/lua-periphery/lua-periphery.hash
diff --git a/software/package/lua-periphery/lua-periphery.mk b/buildroot/package/lua-periphery/lua-periphery.mk
similarity index 100%
rename from software/package/lua-periphery/lua-periphery.mk
rename to buildroot/package/lua-periphery/lua-periphery.mk
diff --git a/software/package/lua-resty-http/Config.in b/buildroot/package/lua-resty-http/Config.in
similarity index 100%
rename from software/package/lua-resty-http/Config.in
rename to buildroot/package/lua-resty-http/Config.in
diff --git a/software/package/lua-resty-http/lua-resty-http.hash b/buildroot/package/lua-resty-http/lua-resty-http.hash
similarity index 100%
rename from software/package/lua-resty-http/lua-resty-http.hash
rename to buildroot/package/lua-resty-http/lua-resty-http.hash
diff --git a/software/package/lua-resty-http/lua-resty-http.mk b/buildroot/package/lua-resty-http/lua-resty-http.mk
similarity index 100%
rename from software/package/lua-resty-http/lua-resty-http.mk
rename to buildroot/package/lua-resty-http/lua-resty-http.mk
diff --git a/software/package/lua-rotas/Config.in b/buildroot/package/lua-rotas/Config.in
similarity index 100%
rename from software/package/lua-rotas/Config.in
rename to buildroot/package/lua-rotas/Config.in
diff --git a/software/package/lua-rotas/lua-rotas.hash b/buildroot/package/lua-rotas/lua-rotas.hash
similarity index 100%
rename from software/package/lua-rotas/lua-rotas.hash
rename to buildroot/package/lua-rotas/lua-rotas.hash
diff --git a/software/package/lua-rotas/lua-rotas.mk b/buildroot/package/lua-rotas/lua-rotas.mk
similarity index 100%
rename from software/package/lua-rotas/lua-rotas.mk
rename to buildroot/package/lua-rotas/lua-rotas.mk
diff --git a/software/package/lua-sailor/Config.in b/buildroot/package/lua-sailor/Config.in
similarity index 100%
rename from software/package/lua-sailor/Config.in
rename to buildroot/package/lua-sailor/Config.in
diff --git a/software/package/lua-sailor/lua-sailor.hash b/buildroot/package/lua-sailor/lua-sailor.hash
similarity index 100%
rename from software/package/lua-sailor/lua-sailor.hash
rename to buildroot/package/lua-sailor/lua-sailor.hash
diff --git a/software/package/lua-sailor/lua-sailor.mk b/buildroot/package/lua-sailor/lua-sailor.mk
similarity index 100%
rename from software/package/lua-sailor/lua-sailor.mk
rename to buildroot/package/lua-sailor/lua-sailor.mk
diff --git a/software/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch b/buildroot/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch
similarity index 100%
rename from software/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch
rename to buildroot/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch
diff --git a/software/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch b/buildroot/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch
similarity index 100%
rename from software/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch
rename to buildroot/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch
diff --git a/software/package/lua-sdl2/Config.in b/buildroot/package/lua-sdl2/Config.in
similarity index 100%
rename from software/package/lua-sdl2/Config.in
rename to buildroot/package/lua-sdl2/Config.in
diff --git a/software/package/lua-sdl2/lua-sdl2.hash b/buildroot/package/lua-sdl2/lua-sdl2.hash
similarity index 100%
rename from software/package/lua-sdl2/lua-sdl2.hash
rename to buildroot/package/lua-sdl2/lua-sdl2.hash
diff --git a/software/package/lua-sdl2/lua-sdl2.mk b/buildroot/package/lua-sdl2/lua-sdl2.mk
similarity index 100%
rename from software/package/lua-sdl2/lua-sdl2.mk
rename to buildroot/package/lua-sdl2/lua-sdl2.mk
diff --git a/software/package/lua-silva/Config.in b/buildroot/package/lua-silva/Config.in
similarity index 100%
rename from software/package/lua-silva/Config.in
rename to buildroot/package/lua-silva/Config.in
diff --git a/software/package/lua-silva/lua-silva.hash b/buildroot/package/lua-silva/lua-silva.hash
similarity index 100%
rename from software/package/lua-silva/lua-silva.hash
rename to buildroot/package/lua-silva/lua-silva.hash
diff --git a/software/package/lua-silva/lua-silva.mk b/buildroot/package/lua-silva/lua-silva.mk
similarity index 100%
rename from software/package/lua-silva/lua-silva.mk
rename to buildroot/package/lua-silva/lua-silva.mk
diff --git a/software/package/lua-std-debug/Config.in b/buildroot/package/lua-std-debug/Config.in
similarity index 100%
rename from software/package/lua-std-debug/Config.in
rename to buildroot/package/lua-std-debug/Config.in
diff --git a/software/package/lua-std-debug/lua-std-debug.hash b/buildroot/package/lua-std-debug/lua-std-debug.hash
similarity index 100%
rename from software/package/lua-std-debug/lua-std-debug.hash
rename to buildroot/package/lua-std-debug/lua-std-debug.hash
diff --git a/software/package/lua-std-debug/lua-std-debug.mk b/buildroot/package/lua-std-debug/lua-std-debug.mk
similarity index 100%
rename from software/package/lua-std-debug/lua-std-debug.mk
rename to buildroot/package/lua-std-debug/lua-std-debug.mk
diff --git a/software/package/lua-std-normalize/Config.in b/buildroot/package/lua-std-normalize/Config.in
similarity index 100%
rename from software/package/lua-std-normalize/Config.in
rename to buildroot/package/lua-std-normalize/Config.in
diff --git a/software/package/lua-std-normalize/lua-std-normalize.hash b/buildroot/package/lua-std-normalize/lua-std-normalize.hash
similarity index 100%
rename from software/package/lua-std-normalize/lua-std-normalize.hash
rename to buildroot/package/lua-std-normalize/lua-std-normalize.hash
diff --git a/software/package/lua-std-normalize/lua-std-normalize.mk b/buildroot/package/lua-std-normalize/lua-std-normalize.mk
similarity index 100%
rename from software/package/lua-std-normalize/lua-std-normalize.mk
rename to buildroot/package/lua-std-normalize/lua-std-normalize.mk
diff --git a/software/package/lua-stdlib/Config.in b/buildroot/package/lua-stdlib/Config.in
similarity index 100%
rename from software/package/lua-stdlib/Config.in
rename to buildroot/package/lua-stdlib/Config.in
diff --git a/software/package/lua-stdlib/lua-stdlib.hash b/buildroot/package/lua-stdlib/lua-stdlib.hash
similarity index 100%
rename from software/package/lua-stdlib/lua-stdlib.hash
rename to buildroot/package/lua-stdlib/lua-stdlib.hash
diff --git a/software/package/lua-stdlib/lua-stdlib.mk b/buildroot/package/lua-stdlib/lua-stdlib.mk
similarity index 100%
rename from software/package/lua-stdlib/lua-stdlib.mk
rename to buildroot/package/lua-stdlib/lua-stdlib.mk
diff --git a/software/package/lua-testmore/Config.in b/buildroot/package/lua-testmore/Config.in
similarity index 100%
rename from software/package/lua-testmore/Config.in
rename to buildroot/package/lua-testmore/Config.in
diff --git a/software/package/lua-testmore/lua-testmore.hash b/buildroot/package/lua-testmore/lua-testmore.hash
similarity index 100%
rename from software/package/lua-testmore/lua-testmore.hash
rename to buildroot/package/lua-testmore/lua-testmore.hash
diff --git a/software/package/lua-testmore/lua-testmore.mk b/buildroot/package/lua-testmore/lua-testmore.mk
similarity index 100%
rename from software/package/lua-testmore/lua-testmore.mk
rename to buildroot/package/lua-testmore/lua-testmore.mk
diff --git a/software/package/lua-utf8/Config.in b/buildroot/package/lua-utf8/Config.in
similarity index 100%
rename from software/package/lua-utf8/Config.in
rename to buildroot/package/lua-utf8/Config.in
diff --git a/software/package/lua-utf8/lua-utf8.hash b/buildroot/package/lua-utf8/lua-utf8.hash
similarity index 100%
rename from software/package/lua-utf8/lua-utf8.hash
rename to buildroot/package/lua-utf8/lua-utf8.hash
diff --git a/software/package/lua-utf8/lua-utf8.mk b/buildroot/package/lua-utf8/lua-utf8.mk
similarity index 100%
rename from software/package/lua-utf8/lua-utf8.mk
rename to buildroot/package/lua-utf8/lua-utf8.mk
diff --git a/software/package/lua-valua/Config.in b/buildroot/package/lua-valua/Config.in
similarity index 100%
rename from software/package/lua-valua/Config.in
rename to buildroot/package/lua-valua/Config.in
diff --git a/software/package/lua-valua/lua-valua.hash b/buildroot/package/lua-valua/lua-valua.hash
similarity index 100%
rename from software/package/lua-valua/lua-valua.hash
rename to buildroot/package/lua-valua/lua-valua.hash
diff --git a/software/package/lua-valua/lua-valua.mk b/buildroot/package/lua-valua/lua-valua.mk
similarity index 100%
rename from software/package/lua-valua/lua-valua.mk
rename to buildroot/package/lua-valua/lua-valua.mk
diff --git a/software/package/lua/5.1.5/0001-root-path.patch b/buildroot/package/lua/5.1.5/0001-root-path.patch
similarity index 100%
rename from software/package/lua/5.1.5/0001-root-path.patch
rename to buildroot/package/lua/5.1.5/0001-root-path.patch
diff --git a/software/package/lua/5.1.5/0002-shared-libs-for-lua.patch b/buildroot/package/lua/5.1.5/0002-shared-libs-for-lua.patch
similarity index 100%
rename from software/package/lua/5.1.5/0002-shared-libs-for-lua.patch
rename to buildroot/package/lua/5.1.5/0002-shared-libs-for-lua.patch
diff --git a/software/package/lua/5.1.5/0011-linenoise.patch b/buildroot/package/lua/5.1.5/0011-linenoise.patch
similarity index 100%
rename from software/package/lua/5.1.5/0011-linenoise.patch
rename to buildroot/package/lua/5.1.5/0011-linenoise.patch
diff --git a/software/package/lua/5.1.5/0012-fix-reader-at-eoz.patch b/buildroot/package/lua/5.1.5/0012-fix-reader-at-eoz.patch
similarity index 100%
rename from software/package/lua/5.1.5/0012-fix-reader-at-eoz.patch
rename to buildroot/package/lua/5.1.5/0012-fix-reader-at-eoz.patch
diff --git a/software/package/lua/5.1.5/lua.hash b/buildroot/package/lua/5.1.5/lua.hash
similarity index 100%
rename from software/package/lua/5.1.5/lua.hash
rename to buildroot/package/lua/5.1.5/lua.hash
diff --git a/software/package/lua/5.3.6/0001-root-path.patch b/buildroot/package/lua/5.3.6/0001-root-path.patch
similarity index 100%
rename from software/package/lua/5.3.6/0001-root-path.patch
rename to buildroot/package/lua/5.3.6/0001-root-path.patch
diff --git a/software/package/lua/5.3.6/0002-shared-libs-for-lua.patch b/buildroot/package/lua/5.3.6/0002-shared-libs-for-lua.patch
similarity index 100%
rename from software/package/lua/5.3.6/0002-shared-libs-for-lua.patch
rename to buildroot/package/lua/5.3.6/0002-shared-libs-for-lua.patch
diff --git a/software/package/lua/5.3.6/0003-linenoise.patch b/buildroot/package/lua/5.3.6/0003-linenoise.patch
similarity index 100%
rename from software/package/lua/5.3.6/0003-linenoise.patch
rename to buildroot/package/lua/5.3.6/0003-linenoise.patch
diff --git a/software/package/lua/5.3.6/lua.hash b/buildroot/package/lua/5.3.6/lua.hash
similarity index 100%
rename from software/package/lua/5.3.6/lua.hash
rename to buildroot/package/lua/5.3.6/lua.hash
diff --git a/software/package/lua/Config.in b/buildroot/package/lua/Config.in
similarity index 100%
rename from software/package/lua/Config.in
rename to buildroot/package/lua/Config.in
diff --git a/software/package/lua/lua.mk b/buildroot/package/lua/lua.mk
similarity index 100%
rename from software/package/lua/lua.mk
rename to buildroot/package/lua/lua.mk
diff --git a/software/package/lua/lua.pc.in b/buildroot/package/lua/lua.pc.in
similarity index 100%
rename from software/package/lua/lua.pc.in
rename to buildroot/package/lua/lua.pc.in
diff --git a/software/package/luabitop/Config.in b/buildroot/package/luabitop/Config.in
similarity index 100%
rename from software/package/luabitop/Config.in
rename to buildroot/package/luabitop/Config.in
diff --git a/software/package/luabitop/luabitop.hash b/buildroot/package/luabitop/luabitop.hash
similarity index 100%
rename from software/package/luabitop/luabitop.hash
rename to buildroot/package/luabitop/luabitop.hash
diff --git a/software/package/luabitop/luabitop.mk b/buildroot/package/luabitop/luabitop.mk
similarity index 100%
rename from software/package/luabitop/luabitop.mk
rename to buildroot/package/luabitop/luabitop.mk
diff --git a/software/package/luadbi-sqlite3/Config.in b/buildroot/package/luadbi-sqlite3/Config.in
similarity index 100%
rename from software/package/luadbi-sqlite3/Config.in
rename to buildroot/package/luadbi-sqlite3/Config.in
diff --git a/software/package/luadbi-sqlite3/luadbi-sqlite3.hash b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
similarity index 100%
rename from software/package/luadbi-sqlite3/luadbi-sqlite3.hash
rename to buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
diff --git a/software/package/luadbi-sqlite3/luadbi-sqlite3.mk b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
similarity index 100%
rename from software/package/luadbi-sqlite3/luadbi-sqlite3.mk
rename to buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
diff --git a/software/package/luadbi/Config.in b/buildroot/package/luadbi/Config.in
similarity index 100%
rename from software/package/luadbi/Config.in
rename to buildroot/package/luadbi/Config.in
diff --git a/software/package/luadbi/luadbi.hash b/buildroot/package/luadbi/luadbi.hash
similarity index 100%
rename from software/package/luadbi/luadbi.hash
rename to buildroot/package/luadbi/luadbi.hash
diff --git a/software/package/luadbi/luadbi.mk b/buildroot/package/luadbi/luadbi.mk
similarity index 100%
rename from software/package/luadbi/luadbi.mk
rename to buildroot/package/luadbi/luadbi.mk
diff --git a/software/package/luaexpat/0001-restore-getcurrentbytecount.patch b/buildroot/package/luaexpat/0001-restore-getcurrentbytecount.patch
similarity index 100%
rename from software/package/luaexpat/0001-restore-getcurrentbytecount.patch
rename to buildroot/package/luaexpat/0001-restore-getcurrentbytecount.patch
diff --git a/software/package/luaexpat/Config.in b/buildroot/package/luaexpat/Config.in
similarity index 100%
rename from software/package/luaexpat/Config.in
rename to buildroot/package/luaexpat/Config.in
diff --git a/software/package/luaexpat/luaexpat.hash b/buildroot/package/luaexpat/luaexpat.hash
similarity index 100%
rename from software/package/luaexpat/luaexpat.hash
rename to buildroot/package/luaexpat/luaexpat.hash
diff --git a/software/package/luaexpat/luaexpat.mk b/buildroot/package/luaexpat/luaexpat.mk
similarity index 100%
rename from software/package/luaexpat/luaexpat.mk
rename to buildroot/package/luaexpat/luaexpat.mk
diff --git a/software/package/luaexpatutils/Config.in b/buildroot/package/luaexpatutils/Config.in
similarity index 100%
rename from software/package/luaexpatutils/Config.in
rename to buildroot/package/luaexpatutils/Config.in
diff --git a/software/package/luaexpatutils/luaexpatutils.hash b/buildroot/package/luaexpatutils/luaexpatutils.hash
similarity index 100%
rename from software/package/luaexpatutils/luaexpatutils.hash
rename to buildroot/package/luaexpatutils/luaexpatutils.hash
diff --git a/software/package/luaexpatutils/luaexpatutils.mk b/buildroot/package/luaexpatutils/luaexpatutils.mk
similarity index 100%
rename from software/package/luaexpatutils/luaexpatutils.mk
rename to buildroot/package/luaexpatutils/luaexpatutils.mk
diff --git a/software/package/luafilesystem/Config.in b/buildroot/package/luafilesystem/Config.in
similarity index 100%
rename from software/package/luafilesystem/Config.in
rename to buildroot/package/luafilesystem/Config.in
diff --git a/software/package/luafilesystem/luafilesystem.hash b/buildroot/package/luafilesystem/luafilesystem.hash
similarity index 100%
rename from software/package/luafilesystem/luafilesystem.hash
rename to buildroot/package/luafilesystem/luafilesystem.hash
diff --git a/software/package/luafilesystem/luafilesystem.mk b/buildroot/package/luafilesystem/luafilesystem.mk
similarity index 100%
rename from software/package/luafilesystem/luafilesystem.mk
rename to buildroot/package/luafilesystem/luafilesystem.mk
diff --git a/software/package/luainterpreter/Config.in b/buildroot/package/luainterpreter/Config.in
similarity index 100%
rename from software/package/luainterpreter/Config.in
rename to buildroot/package/luainterpreter/Config.in
diff --git a/software/package/luainterpreter/luainterpreter.mk b/buildroot/package/luainterpreter/luainterpreter.mk
similarity index 100%
rename from software/package/luainterpreter/luainterpreter.mk
rename to buildroot/package/luainterpreter/luainterpreter.mk
diff --git a/software/package/luajit/0001-no-bin-symlink.patch b/buildroot/package/luajit/0001-no-bin-symlink.patch
similarity index 100%
rename from software/package/luajit/0001-no-bin-symlink.patch
rename to buildroot/package/luajit/0001-no-bin-symlink.patch
diff --git a/software/package/luajit/0002-install-inc.patch b/buildroot/package/luajit/0002-install-inc.patch
similarity index 100%
rename from software/package/luajit/0002-install-inc.patch
rename to buildroot/package/luajit/0002-install-inc.patch
diff --git a/software/package/luajit/Config.in b/buildroot/package/luajit/Config.in
similarity index 100%
rename from software/package/luajit/Config.in
rename to buildroot/package/luajit/Config.in
diff --git a/software/package/luajit/luajit.hash b/buildroot/package/luajit/luajit.hash
similarity index 100%
rename from software/package/luajit/luajit.hash
rename to buildroot/package/luajit/luajit.hash
diff --git a/software/package/luajit/luajit.mk b/buildroot/package/luajit/luajit.mk
similarity index 100%
rename from software/package/luajit/luajit.mk
rename to buildroot/package/luajit/luajit.mk
diff --git a/software/package/luajson/Config.in b/buildroot/package/luajson/Config.in
similarity index 100%
rename from software/package/luajson/Config.in
rename to buildroot/package/luajson/Config.in
diff --git a/software/package/luajson/luajson.hash b/buildroot/package/luajson/luajson.hash
similarity index 100%
rename from software/package/luajson/luajson.hash
rename to buildroot/package/luajson/luajson.hash
diff --git a/software/package/luajson/luajson.mk b/buildroot/package/luajson/luajson.mk
similarity index 100%
rename from software/package/luajson/luajson.mk
rename to buildroot/package/luajson/luajson.mk
diff --git a/software/package/lualogging/Config.in b/buildroot/package/lualogging/Config.in
similarity index 100%
rename from software/package/lualogging/Config.in
rename to buildroot/package/lualogging/Config.in
diff --git a/software/package/lualogging/lualogging.hash b/buildroot/package/lualogging/lualogging.hash
similarity index 100%
rename from software/package/lualogging/lualogging.hash
rename to buildroot/package/lualogging/lualogging.hash
diff --git a/software/package/lualogging/lualogging.mk b/buildroot/package/lualogging/lualogging.mk
similarity index 100%
rename from software/package/lualogging/lualogging.mk
rename to buildroot/package/lualogging/lualogging.mk
diff --git a/software/package/luaossl/Config.in b/buildroot/package/luaossl/Config.in
similarity index 100%
rename from software/package/luaossl/Config.in
rename to buildroot/package/luaossl/Config.in
diff --git a/software/package/luaossl/luaossl.hash b/buildroot/package/luaossl/luaossl.hash
similarity index 100%
rename from software/package/luaossl/luaossl.hash
rename to buildroot/package/luaossl/luaossl.hash
diff --git a/software/package/luaossl/luaossl.mk b/buildroot/package/luaossl/luaossl.mk
similarity index 100%
rename from software/package/luaossl/luaossl.mk
rename to buildroot/package/luaossl/luaossl.mk
diff --git a/software/package/luaposix/Config.in b/buildroot/package/luaposix/Config.in
similarity index 100%
rename from software/package/luaposix/Config.in
rename to buildroot/package/luaposix/Config.in
diff --git a/software/package/luaposix/luaposix.hash b/buildroot/package/luaposix/luaposix.hash
similarity index 100%
rename from software/package/luaposix/luaposix.hash
rename to buildroot/package/luaposix/luaposix.hash
diff --git a/software/package/luaposix/luaposix.mk b/buildroot/package/luaposix/luaposix.mk
similarity index 100%
rename from software/package/luaposix/luaposix.mk
rename to buildroot/package/luaposix/luaposix.mk
diff --git a/software/package/luarocks/buildroot.lua b/buildroot/package/luarocks/buildroot.lua
similarity index 100%
rename from software/package/luarocks/buildroot.lua
rename to buildroot/package/luarocks/buildroot.lua
diff --git a/software/package/luarocks/luarocks-br-config.lua b/buildroot/package/luarocks/luarocks-br-config.lua
similarity index 100%
rename from software/package/luarocks/luarocks-br-config.lua
rename to buildroot/package/luarocks/luarocks-br-config.lua
diff --git a/software/package/luarocks/luarocks.hash b/buildroot/package/luarocks/luarocks.hash
similarity index 100%
rename from software/package/luarocks/luarocks.hash
rename to buildroot/package/luarocks/luarocks.hash
diff --git a/software/package/luarocks/luarocks.mk b/buildroot/package/luarocks/luarocks.mk
similarity index 100%
rename from software/package/luarocks/luarocks.mk
rename to buildroot/package/luarocks/luarocks.mk
diff --git a/software/package/luasec/Config.in b/buildroot/package/luasec/Config.in
similarity index 100%
rename from software/package/luasec/Config.in
rename to buildroot/package/luasec/Config.in
diff --git a/software/package/luasec/luasec.hash b/buildroot/package/luasec/luasec.hash
similarity index 100%
rename from software/package/luasec/luasec.hash
rename to buildroot/package/luasec/luasec.hash
diff --git a/software/package/luasec/luasec.mk b/buildroot/package/luasec/luasec.mk
similarity index 100%
rename from software/package/luasec/luasec.mk
rename to buildroot/package/luasec/luasec.mk
diff --git a/software/package/luasocket/Config.in b/buildroot/package/luasocket/Config.in
similarity index 100%
rename from software/package/luasocket/Config.in
rename to buildroot/package/luasocket/Config.in
diff --git a/software/package/luasocket/luasocket.hash b/buildroot/package/luasocket/luasocket.hash
similarity index 100%
rename from software/package/luasocket/luasocket.hash
rename to buildroot/package/luasocket/luasocket.hash
diff --git a/software/package/luasocket/luasocket.mk b/buildroot/package/luasocket/luasocket.mk
similarity index 100%
rename from software/package/luasocket/luasocket.mk
rename to buildroot/package/luasocket/luasocket.mk
diff --git a/software/package/luasql-sqlite3/Config.in b/buildroot/package/luasql-sqlite3/Config.in
similarity index 100%
rename from software/package/luasql-sqlite3/Config.in
rename to buildroot/package/luasql-sqlite3/Config.in
diff --git a/software/package/luasql-sqlite3/luasql-sqlite3.hash b/buildroot/package/luasql-sqlite3/luasql-sqlite3.hash
similarity index 100%
rename from software/package/luasql-sqlite3/luasql-sqlite3.hash
rename to buildroot/package/luasql-sqlite3/luasql-sqlite3.hash
diff --git a/software/package/luasql-sqlite3/luasql-sqlite3.mk b/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
similarity index 100%
rename from software/package/luasql-sqlite3/luasql-sqlite3.mk
rename to buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
diff --git a/software/package/luasyslog/0001-compat-Lua-5.3.patch b/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch
similarity index 100%
rename from software/package/luasyslog/0001-compat-Lua-5.3.patch
rename to buildroot/package/luasyslog/0001-compat-Lua-5.3.patch
diff --git a/software/package/luasyslog/Config.in b/buildroot/package/luasyslog/Config.in
similarity index 100%
rename from software/package/luasyslog/Config.in
rename to buildroot/package/luasyslog/Config.in
diff --git a/software/package/luasyslog/luasyslog.hash b/buildroot/package/luasyslog/luasyslog.hash
similarity index 100%
rename from software/package/luasyslog/luasyslog.hash
rename to buildroot/package/luasyslog/luasyslog.hash
diff --git a/software/package/luasyslog/luasyslog.mk b/buildroot/package/luasyslog/luasyslog.mk
similarity index 100%
rename from software/package/luasyslog/luasyslog.mk
rename to buildroot/package/luasyslog/luasyslog.mk
diff --git a/software/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch b/buildroot/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch
similarity index 100%
rename from software/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch
rename to buildroot/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch
diff --git a/software/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch b/buildroot/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
similarity index 100%
rename from software/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
rename to buildroot/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
diff --git a/software/package/lugaru/Config.in b/buildroot/package/lugaru/Config.in
similarity index 100%
rename from software/package/lugaru/Config.in
rename to buildroot/package/lugaru/Config.in
diff --git a/software/package/lugaru/lugaru.hash b/buildroot/package/lugaru/lugaru.hash
similarity index 100%
rename from software/package/lugaru/lugaru.hash
rename to buildroot/package/lugaru/lugaru.hash
diff --git a/software/package/lugaru/lugaru.mk b/buildroot/package/lugaru/lugaru.mk
similarity index 100%
rename from software/package/lugaru/lugaru.mk
rename to buildroot/package/lugaru/lugaru.mk
diff --git a/software/package/luksmeta/Config.in b/buildroot/package/luksmeta/Config.in
similarity index 100%
rename from software/package/luksmeta/Config.in
rename to buildroot/package/luksmeta/Config.in
diff --git a/software/package/luksmeta/luksmeta.hash b/buildroot/package/luksmeta/luksmeta.hash
similarity index 100%
rename from software/package/luksmeta/luksmeta.hash
rename to buildroot/package/luksmeta/luksmeta.hash
diff --git a/software/package/luksmeta/luksmeta.mk b/buildroot/package/luksmeta/luksmeta.mk
similarity index 100%
rename from software/package/luksmeta/luksmeta.mk
rename to buildroot/package/luksmeta/luksmeta.mk
diff --git a/software/package/lutok/Config.in b/buildroot/package/lutok/Config.in
similarity index 100%
rename from software/package/lutok/Config.in
rename to buildroot/package/lutok/Config.in
diff --git a/software/package/lutok/lutok.hash b/buildroot/package/lutok/lutok.hash
similarity index 100%
rename from software/package/lutok/lutok.hash
rename to buildroot/package/lutok/lutok.hash
diff --git a/software/package/lutok/lutok.mk b/buildroot/package/lutok/lutok.mk
similarity index 100%
rename from software/package/lutok/lutok.mk
rename to buildroot/package/lutok/lutok.mk
diff --git a/software/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch b/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch
similarity index 100%
rename from software/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch
rename to buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch
diff --git a/software/package/luv/Config.in b/buildroot/package/luv/Config.in
similarity index 100%
rename from software/package/luv/Config.in
rename to buildroot/package/luv/Config.in
diff --git a/software/package/luv/luv.hash b/buildroot/package/luv/luv.hash
similarity index 100%
rename from software/package/luv/luv.hash
rename to buildroot/package/luv/luv.hash
diff --git a/software/package/luv/luv.mk b/buildroot/package/luv/luv.mk
similarity index 100%
rename from software/package/luv/luv.mk
rename to buildroot/package/luv/luv.mk
diff --git a/software/package/luvi/Config.in b/buildroot/package/luvi/Config.in
similarity index 100%
rename from software/package/luvi/Config.in
rename to buildroot/package/luvi/Config.in
diff --git a/software/package/luvi/luvi.hash b/buildroot/package/luvi/luvi.hash
similarity index 100%
rename from software/package/luvi/luvi.hash
rename to buildroot/package/luvi/luvi.hash
diff --git a/software/package/luvi/luvi.mk b/buildroot/package/luvi/luvi.mk
similarity index 100%
rename from software/package/luvi/luvi.mk
rename to buildroot/package/luvi/luvi.mk
diff --git a/software/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch b/buildroot/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
similarity index 100%
rename from software/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
rename to buildroot/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
diff --git a/software/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch b/buildroot/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch
similarity index 100%
rename from software/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch
rename to buildroot/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch
diff --git a/software/package/lvm2/Config.in b/buildroot/package/lvm2/Config.in
similarity index 100%
rename from software/package/lvm2/Config.in
rename to buildroot/package/lvm2/Config.in
diff --git a/software/package/lvm2/lvm2.hash b/buildroot/package/lvm2/lvm2.hash
similarity index 100%
rename from software/package/lvm2/lvm2.hash
rename to buildroot/package/lvm2/lvm2.hash
diff --git a/software/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk
similarity index 100%
rename from software/package/lvm2/lvm2.mk
rename to buildroot/package/lvm2/lvm2.mk
diff --git a/software/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch b/buildroot/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch
similarity index 100%
rename from software/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch
rename to buildroot/package/lxc/0001-syscall_wrappers-rename-internal-memfd_create-to-mem.patch
diff --git a/software/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch b/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch
similarity index 100%
rename from software/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch
rename to buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch
diff --git a/software/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch b/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch
similarity index 100%
rename from software/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch
rename to buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch
diff --git a/software/package/lxc/0004-cgroups-initialize-cpuset-properly.patch b/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch
similarity index 100%
rename from software/package/lxc/0004-cgroups-initialize-cpuset-properly.patch
rename to buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch
diff --git a/software/package/lxc/Config.in b/buildroot/package/lxc/Config.in
similarity index 100%
rename from software/package/lxc/Config.in
rename to buildroot/package/lxc/Config.in
diff --git a/software/package/lxc/lxc.hash b/buildroot/package/lxc/lxc.hash
similarity index 100%
rename from software/package/lxc/lxc.hash
rename to buildroot/package/lxc/lxc.hash
diff --git a/software/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk
similarity index 100%
rename from software/package/lxc/lxc.mk
rename to buildroot/package/lxc/lxc.mk
diff --git a/software/package/lynx/Config.in b/buildroot/package/lynx/Config.in
similarity index 100%
rename from software/package/lynx/Config.in
rename to buildroot/package/lynx/Config.in
diff --git a/software/package/lynx/lynx.hash b/buildroot/package/lynx/lynx.hash
similarity index 100%
rename from software/package/lynx/lynx.hash
rename to buildroot/package/lynx/lynx.hash
diff --git a/software/package/lynx/lynx.mk b/buildroot/package/lynx/lynx.mk
similarity index 100%
rename from software/package/lynx/lynx.mk
rename to buildroot/package/lynx/lynx.mk
diff --git a/software/package/lz4/Config.in b/buildroot/package/lz4/Config.in
similarity index 100%
rename from software/package/lz4/Config.in
rename to buildroot/package/lz4/Config.in
diff --git a/software/package/lz4/lz4.hash b/buildroot/package/lz4/lz4.hash
similarity index 100%
rename from software/package/lz4/lz4.hash
rename to buildroot/package/lz4/lz4.hash
diff --git a/software/package/lz4/lz4.mk b/buildroot/package/lz4/lz4.mk
similarity index 100%
rename from software/package/lz4/lz4.mk
rename to buildroot/package/lz4/lz4.mk
diff --git a/software/package/lzip/Config.in b/buildroot/package/lzip/Config.in
similarity index 100%
rename from software/package/lzip/Config.in
rename to buildroot/package/lzip/Config.in
diff --git a/software/package/lzip/lzip.hash b/buildroot/package/lzip/lzip.hash
similarity index 100%
rename from software/package/lzip/lzip.hash
rename to buildroot/package/lzip/lzip.hash
diff --git a/software/package/lzip/lzip.mk b/buildroot/package/lzip/lzip.mk
similarity index 100%
rename from software/package/lzip/lzip.mk
rename to buildroot/package/lzip/lzip.mk
diff --git a/software/package/lzlib/Config.in b/buildroot/package/lzlib/Config.in
similarity index 100%
rename from software/package/lzlib/Config.in
rename to buildroot/package/lzlib/Config.in
diff --git a/software/package/lzlib/lzlib.hash b/buildroot/package/lzlib/lzlib.hash
similarity index 100%
rename from software/package/lzlib/lzlib.hash
rename to buildroot/package/lzlib/lzlib.hash
diff --git a/software/package/lzlib/lzlib.mk b/buildroot/package/lzlib/lzlib.mk
similarity index 100%
rename from software/package/lzlib/lzlib.mk
rename to buildroot/package/lzlib/lzlib.mk
diff --git a/software/package/lzma/0001-Remove-static-from-LDFLAGS.patch b/buildroot/package/lzma/0001-Remove-static-from-LDFLAGS.patch
similarity index 100%
rename from software/package/lzma/0001-Remove-static-from-LDFLAGS.patch
rename to buildroot/package/lzma/0001-Remove-static-from-LDFLAGS.patch
diff --git a/software/package/lzma/lzma.hash b/buildroot/package/lzma/lzma.hash
similarity index 100%
rename from software/package/lzma/lzma.hash
rename to buildroot/package/lzma/lzma.hash
diff --git a/software/package/lzma/lzma.mk b/buildroot/package/lzma/lzma.mk
similarity index 100%
rename from software/package/lzma/lzma.mk
rename to buildroot/package/lzma/lzma.mk
diff --git a/software/package/lzo/Config.in b/buildroot/package/lzo/Config.in
similarity index 100%
rename from software/package/lzo/Config.in
rename to buildroot/package/lzo/Config.in
diff --git a/software/package/lzo/lzo.hash b/buildroot/package/lzo/lzo.hash
similarity index 100%
rename from software/package/lzo/lzo.hash
rename to buildroot/package/lzo/lzo.hash
diff --git a/software/package/lzo/lzo.mk b/buildroot/package/lzo/lzo.mk
similarity index 100%
rename from software/package/lzo/lzo.mk
rename to buildroot/package/lzo/lzo.mk
diff --git a/software/package/lzop/0001-build-with-gcc6.patch b/buildroot/package/lzop/0001-build-with-gcc6.patch
similarity index 100%
rename from software/package/lzop/0001-build-with-gcc6.patch
rename to buildroot/package/lzop/0001-build-with-gcc6.patch
diff --git a/software/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/buildroot/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch
similarity index 100%
rename from software/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch
rename to buildroot/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch
diff --git a/software/package/lzop/Config.in b/buildroot/package/lzop/Config.in
similarity index 100%
rename from software/package/lzop/Config.in
rename to buildroot/package/lzop/Config.in
diff --git a/software/package/lzop/lzop.hash b/buildroot/package/lzop/lzop.hash
similarity index 100%
rename from software/package/lzop/lzop.hash
rename to buildroot/package/lzop/lzop.hash
diff --git a/software/package/lzop/lzop.mk b/buildroot/package/lzop/lzop.mk
similarity index 100%
rename from software/package/lzop/lzop.mk
rename to buildroot/package/lzop/lzop.mk
diff --git a/software/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
similarity index 100%
rename from software/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
rename to buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
diff --git a/software/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
similarity index 100%
rename from software/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
rename to buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
diff --git a/software/package/m4/m4.hash b/buildroot/package/m4/m4.hash
similarity index 100%
rename from software/package/m4/m4.hash
rename to buildroot/package/m4/m4.hash
diff --git a/software/package/m4/m4.mk b/buildroot/package/m4/m4.mk
similarity index 100%
rename from software/package/m4/m4.mk
rename to buildroot/package/m4/m4.mk
diff --git a/software/package/macchanger/0001-Fix-missing-include-for-caddr_t.patch b/buildroot/package/macchanger/0001-Fix-missing-include-for-caddr_t.patch
similarity index 100%
rename from software/package/macchanger/0001-Fix-missing-include-for-caddr_t.patch
rename to buildroot/package/macchanger/0001-Fix-missing-include-for-caddr_t.patch
diff --git a/software/package/macchanger/Config.in b/buildroot/package/macchanger/Config.in
similarity index 100%
rename from software/package/macchanger/Config.in
rename to buildroot/package/macchanger/Config.in
diff --git a/software/package/macchanger/macchanger.hash b/buildroot/package/macchanger/macchanger.hash
similarity index 100%
rename from software/package/macchanger/macchanger.hash
rename to buildroot/package/macchanger/macchanger.hash
diff --git a/software/package/macchanger/macchanger.mk b/buildroot/package/macchanger/macchanger.mk
similarity index 100%
rename from software/package/macchanger/macchanger.mk
rename to buildroot/package/macchanger/macchanger.mk
diff --git a/software/package/madplay/0001-switch-to-new-alsa-api.patch b/buildroot/package/madplay/0001-switch-to-new-alsa-api.patch
similarity index 100%
rename from software/package/madplay/0001-switch-to-new-alsa-api.patch
rename to buildroot/package/madplay/0001-switch-to-new-alsa-api.patch
diff --git a/software/package/madplay/0002-configure-ac-automake-foreign.patch b/buildroot/package/madplay/0002-configure-ac-automake-foreign.patch
similarity index 100%
rename from software/package/madplay/0002-configure-ac-automake-foreign.patch
rename to buildroot/package/madplay/0002-configure-ac-automake-foreign.patch
diff --git a/software/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch b/buildroot/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch
similarity index 100%
rename from software/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch
rename to buildroot/package/madplay/0003-configure-ac-use-pkg-config-to-find-id3tag.patch
diff --git a/software/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch b/buildroot/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch
similarity index 100%
rename from software/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch
rename to buildroot/package/madplay/0004-configure-ac-call-AM_MKINSTALLDIRS.patch
diff --git a/software/package/madplay/Config.in b/buildroot/package/madplay/Config.in
similarity index 100%
rename from software/package/madplay/Config.in
rename to buildroot/package/madplay/Config.in
diff --git a/software/package/madplay/madplay.hash b/buildroot/package/madplay/madplay.hash
similarity index 100%
rename from software/package/madplay/madplay.hash
rename to buildroot/package/madplay/madplay.hash
diff --git a/software/package/madplay/madplay.mk b/buildroot/package/madplay/madplay.mk
similarity index 100%
rename from software/package/madplay/madplay.mk
rename to buildroot/package/madplay/madplay.mk
diff --git a/software/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch b/buildroot/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch
similarity index 100%
rename from software/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch
rename to buildroot/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch
diff --git a/software/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/buildroot/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
similarity index 100%
rename from software/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
rename to buildroot/package/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
diff --git a/software/package/make/Config.in b/buildroot/package/make/Config.in
similarity index 100%
rename from software/package/make/Config.in
rename to buildroot/package/make/Config.in
diff --git a/software/package/make/make.hash b/buildroot/package/make/make.hash
similarity index 100%
rename from software/package/make/make.hash
rename to buildroot/package/make/make.hash
diff --git a/software/package/make/make.mk b/buildroot/package/make/make.mk
similarity index 100%
rename from software/package/make/make.mk
rename to buildroot/package/make/make.mk
diff --git a/software/package/makedevs/README b/buildroot/package/makedevs/README
similarity index 100%
rename from software/package/makedevs/README
rename to buildroot/package/makedevs/README
diff --git a/software/package/makedevs/makedevs.c b/buildroot/package/makedevs/makedevs.c
similarity index 100%
rename from software/package/makedevs/makedevs.c
rename to buildroot/package/makedevs/makedevs.c
diff --git a/software/package/makedevs/makedevs.mk b/buildroot/package/makedevs/makedevs.mk
similarity index 100%
rename from software/package/makedevs/makedevs.mk
rename to buildroot/package/makedevs/makedevs.mk
diff --git a/software/package/mali-t76x/Config.in b/buildroot/package/mali-t76x/Config.in
similarity index 100%
rename from software/package/mali-t76x/Config.in
rename to buildroot/package/mali-t76x/Config.in
diff --git a/software/package/mali-t76x/egl.pc b/buildroot/package/mali-t76x/egl.pc
similarity index 100%
rename from software/package/mali-t76x/egl.pc
rename to buildroot/package/mali-t76x/egl.pc
diff --git a/software/package/mali-t76x/glesv2.pc b/buildroot/package/mali-t76x/glesv2.pc
similarity index 100%
rename from software/package/mali-t76x/glesv2.pc
rename to buildroot/package/mali-t76x/glesv2.pc
diff --git a/software/package/mali-t76x/mali-t76x.hash b/buildroot/package/mali-t76x/mali-t76x.hash
similarity index 100%
rename from software/package/mali-t76x/mali-t76x.hash
rename to buildroot/package/mali-t76x/mali-t76x.hash
diff --git a/software/package/mali-t76x/mali-t76x.mk b/buildroot/package/mali-t76x/mali-t76x.mk
similarity index 100%
rename from software/package/mali-t76x/mali-t76x.mk
rename to buildroot/package/mali-t76x/mali-t76x.mk
diff --git a/software/package/mariadb/0001-add-extra-check-for-librt.patch b/buildroot/package/mariadb/0001-add-extra-check-for-librt.patch
similarity index 100%
rename from software/package/mariadb/0001-add-extra-check-for-librt.patch
rename to buildroot/package/mariadb/0001-add-extra-check-for-librt.patch
diff --git a/software/package/mariadb/S97mysqld b/buildroot/package/mariadb/S97mysqld
similarity index 100%
rename from software/package/mariadb/S97mysqld
rename to buildroot/package/mariadb/S97mysqld
diff --git a/software/package/mariadb/mariadb.hash b/buildroot/package/mariadb/mariadb.hash
similarity index 100%
rename from software/package/mariadb/mariadb.hash
rename to buildroot/package/mariadb/mariadb.hash
diff --git a/software/package/mariadb/mariadb.mk b/buildroot/package/mariadb/mariadb.mk
similarity index 100%
rename from software/package/mariadb/mariadb.mk
rename to buildroot/package/mariadb/mariadb.mk
diff --git a/software/package/mariadb/mysqld.service b/buildroot/package/mariadb/mysqld.service
similarity index 100%
rename from software/package/mariadb/mysqld.service
rename to buildroot/package/mariadb/mysqld.service
diff --git a/software/package/matchbox-common/Config.in b/buildroot/package/matchbox-common/Config.in
similarity index 100%
rename from software/package/matchbox-common/Config.in
rename to buildroot/package/matchbox-common/Config.in
diff --git a/software/package/matchbox-common/matchbox-common.hash b/buildroot/package/matchbox-common/matchbox-common.hash
similarity index 100%
rename from software/package/matchbox-common/matchbox-common.hash
rename to buildroot/package/matchbox-common/matchbox-common.hash
diff --git a/software/package/matchbox-common/matchbox-common.mk b/buildroot/package/matchbox-common/matchbox-common.mk
similarity index 100%
rename from software/package/matchbox-common/matchbox-common.mk
rename to buildroot/package/matchbox-common/matchbox-common.mk
diff --git a/software/package/matchbox-desktop/Config.in b/buildroot/package/matchbox-desktop/Config.in
similarity index 100%
rename from software/package/matchbox-desktop/Config.in
rename to buildroot/package/matchbox-desktop/Config.in
diff --git a/software/package/matchbox-desktop/matchbox-desktop.hash b/buildroot/package/matchbox-desktop/matchbox-desktop.hash
similarity index 100%
rename from software/package/matchbox-desktop/matchbox-desktop.hash
rename to buildroot/package/matchbox-desktop/matchbox-desktop.hash
diff --git a/software/package/matchbox-desktop/matchbox-desktop.mk b/buildroot/package/matchbox-desktop/matchbox-desktop.mk
similarity index 100%
rename from software/package/matchbox-desktop/matchbox-desktop.mk
rename to buildroot/package/matchbox-desktop/matchbox-desktop.mk
diff --git a/software/package/matchbox-fakekey/Config.in b/buildroot/package/matchbox-fakekey/Config.in
similarity index 100%
rename from software/package/matchbox-fakekey/Config.in
rename to buildroot/package/matchbox-fakekey/Config.in
diff --git a/software/package/matchbox-fakekey/matchbox-fakekey.hash b/buildroot/package/matchbox-fakekey/matchbox-fakekey.hash
similarity index 100%
rename from software/package/matchbox-fakekey/matchbox-fakekey.hash
rename to buildroot/package/matchbox-fakekey/matchbox-fakekey.hash
diff --git a/software/package/matchbox-fakekey/matchbox-fakekey.mk b/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk
similarity index 100%
rename from software/package/matchbox-fakekey/matchbox-fakekey.mk
rename to buildroot/package/matchbox-fakekey/matchbox-fakekey.mk
diff --git a/software/package/matchbox-keyboard/Config.in b/buildroot/package/matchbox-keyboard/Config.in
similarity index 100%
rename from software/package/matchbox-keyboard/Config.in
rename to buildroot/package/matchbox-keyboard/Config.in
diff --git a/software/package/matchbox-keyboard/matchbox-keyboard.hash b/buildroot/package/matchbox-keyboard/matchbox-keyboard.hash
similarity index 100%
rename from software/package/matchbox-keyboard/matchbox-keyboard.hash
rename to buildroot/package/matchbox-keyboard/matchbox-keyboard.hash
diff --git a/software/package/matchbox-keyboard/matchbox-keyboard.mk b/buildroot/package/matchbox-keyboard/matchbox-keyboard.mk
similarity index 100%
rename from software/package/matchbox-keyboard/matchbox-keyboard.mk
rename to buildroot/package/matchbox-keyboard/matchbox-keyboard.mk
diff --git a/software/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh b/buildroot/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh
similarity index 100%
rename from software/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh
rename to buildroot/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh
diff --git a/software/package/matchbox-lib/0001-index-is-legacy.patch b/buildroot/package/matchbox-lib/0001-index-is-legacy.patch
similarity index 100%
rename from software/package/matchbox-lib/0001-index-is-legacy.patch
rename to buildroot/package/matchbox-lib/0001-index-is-legacy.patch
diff --git a/software/package/matchbox-lib/0002-libpng15.patch b/buildroot/package/matchbox-lib/0002-libpng15.patch
similarity index 100%
rename from software/package/matchbox-lib/0002-libpng15.patch
rename to buildroot/package/matchbox-lib/0002-libpng15.patch
diff --git a/software/package/matchbox-lib/0003-include-setjmp-h.patch b/buildroot/package/matchbox-lib/0003-include-setjmp-h.patch
similarity index 100%
rename from software/package/matchbox-lib/0003-include-setjmp-h.patch
rename to buildroot/package/matchbox-lib/0003-include-setjmp-h.patch
diff --git a/software/package/matchbox-lib/Config.in b/buildroot/package/matchbox-lib/Config.in
similarity index 100%
rename from software/package/matchbox-lib/Config.in
rename to buildroot/package/matchbox-lib/Config.in
diff --git a/software/package/matchbox-lib/matchbox-lib.hash b/buildroot/package/matchbox-lib/matchbox-lib.hash
similarity index 100%
rename from software/package/matchbox-lib/matchbox-lib.hash
rename to buildroot/package/matchbox-lib/matchbox-lib.hash
diff --git a/software/package/matchbox-lib/matchbox-lib.mk b/buildroot/package/matchbox-lib/matchbox-lib.mk
similarity index 100%
rename from software/package/matchbox-lib/matchbox-lib.mk
rename to buildroot/package/matchbox-lib/matchbox-lib.mk
diff --git a/software/package/matchbox-panel/0001-index-is-legacy.patch b/buildroot/package/matchbox-panel/0001-index-is-legacy.patch
similarity index 100%
rename from software/package/matchbox-panel/0001-index-is-legacy.patch
rename to buildroot/package/matchbox-panel/0001-index-is-legacy.patch
diff --git a/software/package/matchbox-panel/0002-mb-applet-wireless.patch b/buildroot/package/matchbox-panel/0002-mb-applet-wireless.patch
similarity index 100%
rename from software/package/matchbox-panel/0002-mb-applet-wireless.patch
rename to buildroot/package/matchbox-panel/0002-mb-applet-wireless.patch
diff --git a/software/package/matchbox-panel/0003-mb-applet-battery.patch b/buildroot/package/matchbox-panel/0003-mb-applet-battery.patch
similarity index 100%
rename from software/package/matchbox-panel/0003-mb-applet-battery.patch
rename to buildroot/package/matchbox-panel/0003-mb-applet-battery.patch
diff --git a/software/package/matchbox-panel/Config.in b/buildroot/package/matchbox-panel/Config.in
similarity index 100%
rename from software/package/matchbox-panel/Config.in
rename to buildroot/package/matchbox-panel/Config.in
diff --git a/software/package/matchbox-panel/matchbox-panel.hash b/buildroot/package/matchbox-panel/matchbox-panel.hash
similarity index 100%
rename from software/package/matchbox-panel/matchbox-panel.hash
rename to buildroot/package/matchbox-panel/matchbox-panel.hash
diff --git a/software/package/matchbox-panel/matchbox-panel.mk b/buildroot/package/matchbox-panel/matchbox-panel.mk
similarity index 100%
rename from software/package/matchbox-panel/matchbox-panel.mk
rename to buildroot/package/matchbox-panel/matchbox-panel.mk
diff --git a/software/package/matchbox-startup-monitor/0001-true-false.patch b/buildroot/package/matchbox-startup-monitor/0001-true-false.patch
similarity index 100%
rename from software/package/matchbox-startup-monitor/0001-true-false.patch
rename to buildroot/package/matchbox-startup-monitor/0001-true-false.patch
diff --git a/software/package/matchbox-startup-monitor/Config.in b/buildroot/package/matchbox-startup-monitor/Config.in
similarity index 100%
rename from software/package/matchbox-startup-monitor/Config.in
rename to buildroot/package/matchbox-startup-monitor/Config.in
diff --git a/software/package/matchbox-startup-monitor/matchbox-startup-monitor.hash b/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.hash
similarity index 100%
rename from software/package/matchbox-startup-monitor/matchbox-startup-monitor.hash
rename to buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.hash
diff --git a/software/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
similarity index 100%
rename from software/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
rename to buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
diff --git a/software/package/matchbox/0001-defaulttheme.patch b/buildroot/package/matchbox/0001-defaulttheme.patch
similarity index 100%
rename from software/package/matchbox/0001-defaulttheme.patch
rename to buildroot/package/matchbox/0001-defaulttheme.patch
diff --git a/software/package/matchbox/Config.in b/buildroot/package/matchbox/Config.in
similarity index 100%
rename from software/package/matchbox/Config.in
rename to buildroot/package/matchbox/Config.in
diff --git a/software/package/matchbox/matchbox.hash b/buildroot/package/matchbox/matchbox.hash
similarity index 100%
rename from software/package/matchbox/matchbox.hash
rename to buildroot/package/matchbox/matchbox.hash
diff --git a/software/package/matchbox/matchbox.mk b/buildroot/package/matchbox/matchbox.mk
similarity index 100%
rename from software/package/matchbox/matchbox.mk
rename to buildroot/package/matchbox/matchbox.mk
diff --git a/software/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/buildroot/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch
similarity index 100%
rename from software/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch
rename to buildroot/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch
diff --git a/software/package/mbedtls/Config.in b/buildroot/package/mbedtls/Config.in
similarity index 100%
rename from software/package/mbedtls/Config.in
rename to buildroot/package/mbedtls/Config.in
diff --git a/software/package/mbedtls/mbedtls.hash b/buildroot/package/mbedtls/mbedtls.hash
similarity index 100%
rename from software/package/mbedtls/mbedtls.hash
rename to buildroot/package/mbedtls/mbedtls.hash
diff --git a/software/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk
similarity index 100%
rename from software/package/mbedtls/mbedtls.mk
rename to buildroot/package/mbedtls/mbedtls.mk
diff --git a/software/package/mc/Config.in b/buildroot/package/mc/Config.in
similarity index 100%
rename from software/package/mc/Config.in
rename to buildroot/package/mc/Config.in
diff --git a/software/package/mc/mc.hash b/buildroot/package/mc/mc.hash
similarity index 100%
rename from software/package/mc/mc.hash
rename to buildroot/package/mc/mc.hash
diff --git a/software/package/mc/mc.mk b/buildroot/package/mc/mc.mk
similarity index 100%
rename from software/package/mc/mc.mk
rename to buildroot/package/mc/mc.mk
diff --git a/software/package/mcelog/Config.in b/buildroot/package/mcelog/Config.in
similarity index 100%
rename from software/package/mcelog/Config.in
rename to buildroot/package/mcelog/Config.in
diff --git a/software/package/mcelog/mcelog.hash b/buildroot/package/mcelog/mcelog.hash
similarity index 100%
rename from software/package/mcelog/mcelog.hash
rename to buildroot/package/mcelog/mcelog.hash
diff --git a/software/package/mcelog/mcelog.mk b/buildroot/package/mcelog/mcelog.mk
similarity index 100%
rename from software/package/mcelog/mcelog.mk
rename to buildroot/package/mcelog/mcelog.mk
diff --git a/software/package/mcrypt/0001-CVE-2012-4409.patch b/buildroot/package/mcrypt/0001-CVE-2012-4409.patch
similarity index 100%
rename from software/package/mcrypt/0001-CVE-2012-4409.patch
rename to buildroot/package/mcrypt/0001-CVE-2012-4409.patch
diff --git a/software/package/mcrypt/0002-CVE-2012-4426.patch b/buildroot/package/mcrypt/0002-CVE-2012-4426.patch
similarity index 100%
rename from software/package/mcrypt/0002-CVE-2012-4426.patch
rename to buildroot/package/mcrypt/0002-CVE-2012-4426.patch
diff --git a/software/package/mcrypt/0003-CVE-2012-4527.patch b/buildroot/package/mcrypt/0003-CVE-2012-4527.patch
similarity index 100%
rename from software/package/mcrypt/0003-CVE-2012-4527.patch
rename to buildroot/package/mcrypt/0003-CVE-2012-4527.patch
diff --git a/software/package/mcrypt/0004-no-rpath.patch b/buildroot/package/mcrypt/0004-no-rpath.patch
similarity index 100%
rename from software/package/mcrypt/0004-no-rpath.patch
rename to buildroot/package/mcrypt/0004-no-rpath.patch
diff --git a/software/package/mcrypt/Config.in b/buildroot/package/mcrypt/Config.in
similarity index 100%
rename from software/package/mcrypt/Config.in
rename to buildroot/package/mcrypt/Config.in
diff --git a/software/package/mcrypt/mcrypt.hash b/buildroot/package/mcrypt/mcrypt.hash
similarity index 100%
rename from software/package/mcrypt/mcrypt.hash
rename to buildroot/package/mcrypt/mcrypt.hash
diff --git a/software/package/mcrypt/mcrypt.mk b/buildroot/package/mcrypt/mcrypt.mk
similarity index 100%
rename from software/package/mcrypt/mcrypt.mk
rename to buildroot/package/mcrypt/mcrypt.mk
diff --git a/software/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch b/buildroot/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch
similarity index 100%
rename from software/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch
rename to buildroot/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch
diff --git a/software/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/buildroot/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch
similarity index 100%
rename from software/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch
rename to buildroot/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch
diff --git a/software/package/mdadm/Config.in b/buildroot/package/mdadm/Config.in
similarity index 100%
rename from software/package/mdadm/Config.in
rename to buildroot/package/mdadm/Config.in
diff --git a/software/package/mdadm/mdadm.hash b/buildroot/package/mdadm/mdadm.hash
similarity index 100%
rename from software/package/mdadm/mdadm.hash
rename to buildroot/package/mdadm/mdadm.hash
diff --git a/software/package/mdadm/mdadm.mk b/buildroot/package/mdadm/mdadm.mk
similarity index 100%
rename from software/package/mdadm/mdadm.mk
rename to buildroot/package/mdadm/mdadm.mk
diff --git a/software/package/mdevd/Config.in b/buildroot/package/mdevd/Config.in
similarity index 100%
rename from software/package/mdevd/Config.in
rename to buildroot/package/mdevd/Config.in
diff --git a/software/package/mdevd/mdevd.hash b/buildroot/package/mdevd/mdevd.hash
similarity index 100%
rename from software/package/mdevd/mdevd.hash
rename to buildroot/package/mdevd/mdevd.hash
diff --git a/software/package/mdevd/mdevd.mk b/buildroot/package/mdevd/mdevd.mk
similarity index 100%
rename from software/package/mdevd/mdevd.mk
rename to buildroot/package/mdevd/mdevd.mk
diff --git a/software/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch b/buildroot/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch
similarity index 100%
rename from software/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch
rename to buildroot/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch
diff --git a/software/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch b/buildroot/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch
similarity index 100%
rename from software/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch
rename to buildroot/package/mediastreamer/0002-Use-AV_INPUT_BUFFER_PADDING_SIZE-to-determine-paddin.patch
diff --git a/software/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch b/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch
similarity index 100%
rename from software/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch
rename to buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch
diff --git a/software/package/mediastreamer/Config.in b/buildroot/package/mediastreamer/Config.in
similarity index 100%
rename from software/package/mediastreamer/Config.in
rename to buildroot/package/mediastreamer/Config.in
diff --git a/software/package/mediastreamer/mediastreamer.hash b/buildroot/package/mediastreamer/mediastreamer.hash
similarity index 100%
rename from software/package/mediastreamer/mediastreamer.hash
rename to buildroot/package/mediastreamer/mediastreamer.hash
diff --git a/software/package/mediastreamer/mediastreamer.mk b/buildroot/package/mediastreamer/mediastreamer.mk
similarity index 100%
rename from software/package/mediastreamer/mediastreamer.mk
rename to buildroot/package/mediastreamer/mediastreamer.mk
diff --git a/software/package/memcached/Config.in b/buildroot/package/memcached/Config.in
similarity index 100%
rename from software/package/memcached/Config.in
rename to buildroot/package/memcached/Config.in
diff --git a/software/package/memcached/memcached.hash b/buildroot/package/memcached/memcached.hash
similarity index 100%
rename from software/package/memcached/memcached.hash
rename to buildroot/package/memcached/memcached.hash
diff --git a/software/package/memcached/memcached.mk b/buildroot/package/memcached/memcached.mk
similarity index 100%
rename from software/package/memcached/memcached.mk
rename to buildroot/package/memcached/memcached.mk
diff --git a/software/package/memstat/0001-PATH_MAX.patch b/buildroot/package/memstat/0001-PATH_MAX.patch
similarity index 100%
rename from software/package/memstat/0001-PATH_MAX.patch
rename to buildroot/package/memstat/0001-PATH_MAX.patch
diff --git a/software/package/memstat/Config.in b/buildroot/package/memstat/Config.in
similarity index 100%
rename from software/package/memstat/Config.in
rename to buildroot/package/memstat/Config.in
diff --git a/software/package/memstat/memstat.hash b/buildroot/package/memstat/memstat.hash
similarity index 100%
rename from software/package/memstat/memstat.hash
rename to buildroot/package/memstat/memstat.hash
diff --git a/software/package/memstat/memstat.mk b/buildroot/package/memstat/memstat.mk
similarity index 100%
rename from software/package/memstat/memstat.mk
rename to buildroot/package/memstat/memstat.mk
diff --git a/software/package/memtest86/Config.in b/buildroot/package/memtest86/Config.in
similarity index 100%
rename from software/package/memtest86/Config.in
rename to buildroot/package/memtest86/Config.in
diff --git a/software/package/memtest86/memtest86.hash b/buildroot/package/memtest86/memtest86.hash
similarity index 100%
rename from software/package/memtest86/memtest86.hash
rename to buildroot/package/memtest86/memtest86.hash
diff --git a/software/package/memtest86/memtest86.mk b/buildroot/package/memtest86/memtest86.mk
similarity index 100%
rename from software/package/memtest86/memtest86.mk
rename to buildroot/package/memtest86/memtest86.mk
diff --git a/software/package/memtester/0001-makefile-fix.patch b/buildroot/package/memtester/0001-makefile-fix.patch
similarity index 100%
rename from software/package/memtester/0001-makefile-fix.patch
rename to buildroot/package/memtester/0001-makefile-fix.patch
diff --git a/software/package/memtester/Config.in b/buildroot/package/memtester/Config.in
similarity index 100%
rename from software/package/memtester/Config.in
rename to buildroot/package/memtester/Config.in
diff --git a/software/package/memtester/memtester.hash b/buildroot/package/memtester/memtester.hash
similarity index 100%
rename from software/package/memtester/memtester.hash
rename to buildroot/package/memtester/memtester.hash
diff --git a/software/package/memtester/memtester.mk b/buildroot/package/memtester/memtester.mk
similarity index 100%
rename from software/package/memtester/memtester.mk
rename to buildroot/package/memtester/memtester.mk
diff --git a/software/package/memtool/Config.in b/buildroot/package/memtool/Config.in
similarity index 100%
rename from software/package/memtool/Config.in
rename to buildroot/package/memtool/Config.in
diff --git a/software/package/memtool/memtool.hash b/buildroot/package/memtool/memtool.hash
similarity index 100%
rename from software/package/memtool/memtool.hash
rename to buildroot/package/memtool/memtool.hash
diff --git a/software/package/memtool/memtool.mk b/buildroot/package/memtool/memtool.mk
similarity index 100%
rename from software/package/memtool/memtool.mk
rename to buildroot/package/memtool/memtool.mk
diff --git a/software/package/mender-artifact/Config.in.host b/buildroot/package/mender-artifact/Config.in.host
similarity index 100%
rename from software/package/mender-artifact/Config.in.host
rename to buildroot/package/mender-artifact/Config.in.host
diff --git a/software/package/mender-artifact/mender-artifact.hash b/buildroot/package/mender-artifact/mender-artifact.hash
similarity index 100%
rename from software/package/mender-artifact/mender-artifact.hash
rename to buildroot/package/mender-artifact/mender-artifact.hash
diff --git a/software/package/mender-artifact/mender-artifact.mk b/buildroot/package/mender-artifact/mender-artifact.mk
similarity index 100%
rename from software/package/mender-artifact/mender-artifact.mk
rename to buildroot/package/mender-artifact/mender-artifact.mk
diff --git a/software/package/mender-grubenv/Config.in b/buildroot/package/mender-grubenv/Config.in
similarity index 100%
rename from software/package/mender-grubenv/Config.in
rename to buildroot/package/mender-grubenv/Config.in
diff --git a/software/package/mender-grubenv/mender-grubenv.hash b/buildroot/package/mender-grubenv/mender-grubenv.hash
similarity index 100%
rename from software/package/mender-grubenv/mender-grubenv.hash
rename to buildroot/package/mender-grubenv/mender-grubenv.hash
diff --git a/software/package/mender-grubenv/mender-grubenv.mk b/buildroot/package/mender-grubenv/mender-grubenv.mk
similarity index 100%
rename from software/package/mender-grubenv/mender-grubenv.mk
rename to buildroot/package/mender-grubenv/mender-grubenv.mk
diff --git a/software/package/mender/Config.in b/buildroot/package/mender/Config.in
similarity index 100%
rename from software/package/mender/Config.in
rename to buildroot/package/mender/Config.in
diff --git a/software/package/mender/S42mender b/buildroot/package/mender/S42mender
similarity index 100%
rename from software/package/mender/S42mender
rename to buildroot/package/mender/S42mender
diff --git a/software/package/mender/artifact_info b/buildroot/package/mender/artifact_info
similarity index 100%
rename from software/package/mender/artifact_info
rename to buildroot/package/mender/artifact_info
diff --git a/software/package/mender/device_type b/buildroot/package/mender/device_type
similarity index 100%
rename from software/package/mender/device_type
rename to buildroot/package/mender/device_type
diff --git a/software/package/mender/mender.conf b/buildroot/package/mender/mender.conf
similarity index 100%
rename from software/package/mender/mender.conf
rename to buildroot/package/mender/mender.conf
diff --git a/software/package/mender/mender.hash b/buildroot/package/mender/mender.hash
similarity index 100%
rename from software/package/mender/mender.hash
rename to buildroot/package/mender/mender.hash
diff --git a/software/package/mender/mender.mk b/buildroot/package/mender/mender.mk
similarity index 100%
rename from software/package/mender/mender.mk
rename to buildroot/package/mender/mender.mk
diff --git a/software/package/mender/mender.service b/buildroot/package/mender/mender.service
similarity index 100%
rename from software/package/mender/mender.service
rename to buildroot/package/mender/mender.service
diff --git a/software/package/mender/readme.txt b/buildroot/package/mender/readme.txt
similarity index 100%
rename from software/package/mender/readme.txt
rename to buildroot/package/mender/readme.txt
diff --git a/software/package/mender/server.crt b/buildroot/package/mender/server.crt
similarity index 100%
rename from software/package/mender/server.crt
rename to buildroot/package/mender/server.crt
diff --git a/software/package/menu-cache/Config.in b/buildroot/package/menu-cache/Config.in
similarity index 100%
rename from software/package/menu-cache/Config.in
rename to buildroot/package/menu-cache/Config.in
diff --git a/software/package/menu-cache/menu-cache.hash b/buildroot/package/menu-cache/menu-cache.hash
similarity index 100%
rename from software/package/menu-cache/menu-cache.hash
rename to buildroot/package/menu-cache/menu-cache.hash
diff --git a/software/package/menu-cache/menu-cache.mk b/buildroot/package/menu-cache/menu-cache.mk
similarity index 100%
rename from software/package/menu-cache/menu-cache.mk
rename to buildroot/package/menu-cache/menu-cache.mk
diff --git a/software/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/buildroot/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch
similarity index 100%
rename from software/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch
rename to buildroot/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch
diff --git a/software/package/mesa3d-demos/Config.in b/buildroot/package/mesa3d-demos/Config.in
similarity index 100%
rename from software/package/mesa3d-demos/Config.in
rename to buildroot/package/mesa3d-demos/Config.in
diff --git a/software/package/mesa3d-demos/mesa3d-demos.hash b/buildroot/package/mesa3d-demos/mesa3d-demos.hash
similarity index 100%
rename from software/package/mesa3d-demos/mesa3d-demos.hash
rename to buildroot/package/mesa3d-demos/mesa3d-demos.hash
diff --git a/software/package/mesa3d-demos/mesa3d-demos.mk b/buildroot/package/mesa3d-demos/mesa3d-demos.mk
similarity index 100%
rename from software/package/mesa3d-demos/mesa3d-demos.mk
rename to buildroot/package/mesa3d-demos/mesa3d-demos.mk
diff --git a/software/package/mesa3d-headers/Config.in b/buildroot/package/mesa3d-headers/Config.in
similarity index 100%
rename from software/package/mesa3d-headers/Config.in
rename to buildroot/package/mesa3d-headers/Config.in
diff --git a/software/package/mesa3d-headers/dri.pc b/buildroot/package/mesa3d-headers/dri.pc
similarity index 100%
rename from software/package/mesa3d-headers/dri.pc
rename to buildroot/package/mesa3d-headers/dri.pc
diff --git a/software/package/mesa3d-headers/mesa3d-headers.hash b/buildroot/package/mesa3d-headers/mesa3d-headers.hash
similarity index 100%
rename from software/package/mesa3d-headers/mesa3d-headers.hash
rename to buildroot/package/mesa3d-headers/mesa3d-headers.hash
diff --git a/software/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk
similarity index 100%
rename from software/package/mesa3d-headers/mesa3d-headers.mk
rename to buildroot/package/mesa3d-headers/mesa3d-headers.mk
diff --git a/software/package/mesa3d/0001-musl.patch b/buildroot/package/mesa3d/0001-musl.patch
similarity index 100%
rename from software/package/mesa3d/0001-musl.patch
rename to buildroot/package/mesa3d/0001-musl.patch
diff --git a/software/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch b/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
similarity index 100%
rename from software/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
rename to buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
diff --git a/software/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch
similarity index 100%
rename from software/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch
rename to buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch
diff --git a/software/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch b/buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch
similarity index 100%
rename from software/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch
rename to buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch
diff --git a/software/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch b/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch
similarity index 100%
rename from software/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch
rename to buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch
diff --git a/software/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
similarity index 100%
rename from software/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
rename to buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
diff --git a/software/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in
similarity index 100%
rename from software/package/mesa3d/Config.in
rename to buildroot/package/mesa3d/Config.in
diff --git a/software/package/mesa3d/mesa3d.hash b/buildroot/package/mesa3d/mesa3d.hash
similarity index 100%
rename from software/package/mesa3d/mesa3d.hash
rename to buildroot/package/mesa3d/mesa3d.hash
diff --git a/software/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk
similarity index 100%
rename from software/package/mesa3d/mesa3d.mk
rename to buildroot/package/mesa3d/mesa3d.mk
diff --git a/software/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
similarity index 100%
rename from software/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
rename to buildroot/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
diff --git a/software/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch b/buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch
similarity index 100%
rename from software/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch
rename to buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch
diff --git a/software/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch b/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch
similarity index 100%
rename from software/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch
rename to buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch
diff --git a/software/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch
similarity index 100%
rename from software/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch
rename to buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch
diff --git a/software/package/meson/cross-compilation.conf.in b/buildroot/package/meson/cross-compilation.conf.in
similarity index 100%
rename from software/package/meson/cross-compilation.conf.in
rename to buildroot/package/meson/cross-compilation.conf.in
diff --git a/software/package/meson/meson.hash b/buildroot/package/meson/meson.hash
similarity index 100%
rename from software/package/meson/meson.hash
rename to buildroot/package/meson/meson.hash
diff --git a/software/package/meson/meson.mk b/buildroot/package/meson/meson.mk
similarity index 100%
rename from software/package/meson/meson.mk
rename to buildroot/package/meson/meson.mk
diff --git a/software/package/metacity/0001-add-libm-reference.patch b/buildroot/package/metacity/0001-add-libm-reference.patch
similarity index 100%
rename from software/package/metacity/0001-add-libm-reference.patch
rename to buildroot/package/metacity/0001-add-libm-reference.patch
diff --git a/software/package/metacity/0002-gconf.patch b/buildroot/package/metacity/0002-gconf.patch
similarity index 100%
rename from software/package/metacity/0002-gconf.patch
rename to buildroot/package/metacity/0002-gconf.patch
diff --git a/software/package/metacity/0003-mag-add-libm-reference.patch b/buildroot/package/metacity/0003-mag-add-libm-reference.patch
similarity index 100%
rename from software/package/metacity/0003-mag-add-libm-reference.patch
rename to buildroot/package/metacity/0003-mag-add-libm-reference.patch
diff --git a/software/package/metacity/Config.in b/buildroot/package/metacity/Config.in
similarity index 100%
rename from software/package/metacity/Config.in
rename to buildroot/package/metacity/Config.in
diff --git a/software/package/metacity/Xsession b/buildroot/package/metacity/Xsession
similarity index 100%
rename from software/package/metacity/Xsession
rename to buildroot/package/metacity/Xsession
diff --git a/software/package/metacity/metacity.hash b/buildroot/package/metacity/metacity.hash
similarity index 100%
rename from software/package/metacity/metacity.hash
rename to buildroot/package/metacity/metacity.hash
diff --git a/software/package/metacity/metacity.mk b/buildroot/package/metacity/metacity.mk
similarity index 100%
rename from software/package/metacity/metacity.mk
rename to buildroot/package/metacity/metacity.mk
diff --git a/software/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch b/buildroot/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch
similarity index 100%
rename from software/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch
rename to buildroot/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch
diff --git a/software/package/mfgtools/Config.in.host b/buildroot/package/mfgtools/Config.in.host
similarity index 100%
rename from software/package/mfgtools/Config.in.host
rename to buildroot/package/mfgtools/Config.in.host
diff --git a/software/package/mfgtools/mfgtools.hash b/buildroot/package/mfgtools/mfgtools.hash
similarity index 100%
rename from software/package/mfgtools/mfgtools.hash
rename to buildroot/package/mfgtools/mfgtools.hash
diff --git a/software/package/mfgtools/mfgtools.mk b/buildroot/package/mfgtools/mfgtools.mk
similarity index 100%
rename from software/package/mfgtools/mfgtools.mk
rename to buildroot/package/mfgtools/mfgtools.mk
diff --git a/software/package/mfgtools/readme.txt b/buildroot/package/mfgtools/readme.txt
similarity index 100%
rename from software/package/mfgtools/readme.txt
rename to buildroot/package/mfgtools/readme.txt
diff --git a/software/package/mfoc/Config.in b/buildroot/package/mfoc/Config.in
similarity index 100%
rename from software/package/mfoc/Config.in
rename to buildroot/package/mfoc/Config.in
diff --git a/software/package/mfoc/mfoc.hash b/buildroot/package/mfoc/mfoc.hash
similarity index 100%
rename from software/package/mfoc/mfoc.hash
rename to buildroot/package/mfoc/mfoc.hash
diff --git a/software/package/mfoc/mfoc.mk b/buildroot/package/mfoc/mfoc.mk
similarity index 100%
rename from software/package/mfoc/mfoc.mk
rename to buildroot/package/mfoc/mfoc.mk
diff --git a/software/package/micropython-lib/Config.in b/buildroot/package/micropython-lib/Config.in
similarity index 100%
rename from software/package/micropython-lib/Config.in
rename to buildroot/package/micropython-lib/Config.in
diff --git a/software/package/micropython-lib/micropython-lib.hash b/buildroot/package/micropython-lib/micropython-lib.hash
similarity index 100%
rename from software/package/micropython-lib/micropython-lib.hash
rename to buildroot/package/micropython-lib/micropython-lib.hash
diff --git a/software/package/micropython-lib/micropython-lib.mk b/buildroot/package/micropython-lib/micropython-lib.mk
similarity index 100%
rename from software/package/micropython-lib/micropython-lib.mk
rename to buildroot/package/micropython-lib/micropython-lib.mk
diff --git a/software/package/micropython/Config.in b/buildroot/package/micropython/Config.in
similarity index 100%
rename from software/package/micropython/Config.in
rename to buildroot/package/micropython/Config.in
diff --git a/software/package/micropython/micropython.hash b/buildroot/package/micropython/micropython.hash
similarity index 100%
rename from software/package/micropython/micropython.hash
rename to buildroot/package/micropython/micropython.hash
diff --git a/software/package/micropython/micropython.mk b/buildroot/package/micropython/micropython.mk
similarity index 100%
rename from software/package/micropython/micropython.mk
rename to buildroot/package/micropython/micropython.mk
diff --git a/software/package/midori/0001-fix-bug-1492932.patch b/buildroot/package/midori/0001-fix-bug-1492932.patch
similarity index 100%
rename from software/package/midori/0001-fix-bug-1492932.patch
rename to buildroot/package/midori/0001-fix-bug-1492932.patch
diff --git a/software/package/midori/0002-gcr-for-x11-only.patch b/buildroot/package/midori/0002-gcr-for-x11-only.patch
similarity index 100%
rename from software/package/midori/0002-gcr-for-x11-only.patch
rename to buildroot/package/midori/0002-gcr-for-x11-only.patch
diff --git a/software/package/midori/Config.in b/buildroot/package/midori/Config.in
similarity index 100%
rename from software/package/midori/Config.in
rename to buildroot/package/midori/Config.in
diff --git a/software/package/midori/midori.hash b/buildroot/package/midori/midori.hash
similarity index 100%
rename from software/package/midori/midori.hash
rename to buildroot/package/midori/midori.hash
diff --git a/software/package/midori/midori.mk b/buildroot/package/midori/midori.mk
similarity index 100%
rename from software/package/midori/midori.mk
rename to buildroot/package/midori/midori.mk
diff --git a/software/package/mii-diag/0001-strchr.patch b/buildroot/package/mii-diag/0001-strchr.patch
similarity index 100%
rename from software/package/mii-diag/0001-strchr.patch
rename to buildroot/package/mii-diag/0001-strchr.patch
diff --git a/software/package/mii-diag/Config.in b/buildroot/package/mii-diag/Config.in
similarity index 100%
rename from software/package/mii-diag/Config.in
rename to buildroot/package/mii-diag/Config.in
diff --git a/software/package/mii-diag/mii-diag.hash b/buildroot/package/mii-diag/mii-diag.hash
similarity index 100%
rename from software/package/mii-diag/mii-diag.hash
rename to buildroot/package/mii-diag/mii-diag.hash
diff --git a/software/package/mii-diag/mii-diag.mk b/buildroot/package/mii-diag/mii-diag.mk
similarity index 100%
rename from software/package/mii-diag/mii-diag.mk
rename to buildroot/package/mii-diag/mii-diag.mk
diff --git a/software/package/mimic/Config.in b/buildroot/package/mimic/Config.in
similarity index 100%
rename from software/package/mimic/Config.in
rename to buildroot/package/mimic/Config.in
diff --git a/software/package/mimic/mimic.hash b/buildroot/package/mimic/mimic.hash
similarity index 100%
rename from software/package/mimic/mimic.hash
rename to buildroot/package/mimic/mimic.hash
diff --git a/software/package/mimic/mimic.mk b/buildroot/package/mimic/mimic.mk
similarity index 100%
rename from software/package/mimic/mimic.mk
rename to buildroot/package/mimic/mimic.mk
diff --git a/software/package/minetest-game/Config.in b/buildroot/package/minetest-game/Config.in
similarity index 100%
rename from software/package/minetest-game/Config.in
rename to buildroot/package/minetest-game/Config.in
diff --git a/software/package/minetest-game/minetest-game.hash b/buildroot/package/minetest-game/minetest-game.hash
similarity index 100%
rename from software/package/minetest-game/minetest-game.hash
rename to buildroot/package/minetest-game/minetest-game.hash
diff --git a/software/package/minetest-game/minetest-game.mk b/buildroot/package/minetest-game/minetest-game.mk
similarity index 100%
rename from software/package/minetest-game/minetest-game.mk
rename to buildroot/package/minetest-game/minetest-game.mk
diff --git a/software/package/minetest/Config.in b/buildroot/package/minetest/Config.in
similarity index 100%
rename from software/package/minetest/Config.in
rename to buildroot/package/minetest/Config.in
diff --git a/software/package/minetest/minetest.hash b/buildroot/package/minetest/minetest.hash
similarity index 100%
rename from software/package/minetest/minetest.hash
rename to buildroot/package/minetest/minetest.hash
diff --git a/software/package/minetest/minetest.mk b/buildroot/package/minetest/minetest.mk
similarity index 100%
rename from software/package/minetest/minetest.mk
rename to buildroot/package/minetest/minetest.mk
diff --git a/software/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch b/buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
similarity index 100%
rename from software/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
rename to buildroot/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
diff --git a/software/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch b/buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
similarity index 100%
rename from software/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
rename to buildroot/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
diff --git a/software/package/mini-snmpd/Config.in b/buildroot/package/mini-snmpd/Config.in
similarity index 100%
rename from software/package/mini-snmpd/Config.in
rename to buildroot/package/mini-snmpd/Config.in
diff --git a/software/package/mini-snmpd/mini-snmpd.hash b/buildroot/package/mini-snmpd/mini-snmpd.hash
similarity index 100%
rename from software/package/mini-snmpd/mini-snmpd.hash
rename to buildroot/package/mini-snmpd/mini-snmpd.hash
diff --git a/software/package/mini-snmpd/mini-snmpd.mk b/buildroot/package/mini-snmpd/mini-snmpd.mk
similarity index 100%
rename from software/package/mini-snmpd/mini-snmpd.mk
rename to buildroot/package/mini-snmpd/mini-snmpd.mk
diff --git a/software/package/mini-snmpd/mini-snmpd.service b/buildroot/package/mini-snmpd/mini-snmpd.service
similarity index 100%
rename from software/package/mini-snmpd/mini-snmpd.service
rename to buildroot/package/mini-snmpd/mini-snmpd.service
diff --git a/software/package/minicom/0001-fix-static-linking-with-ncurses.patch b/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch
similarity index 100%
rename from software/package/minicom/0001-fix-static-linking-with-ncurses.patch
rename to buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch
diff --git a/software/package/minicom/Config.in b/buildroot/package/minicom/Config.in
similarity index 100%
rename from software/package/minicom/Config.in
rename to buildroot/package/minicom/Config.in
diff --git a/software/package/minicom/minicom.hash b/buildroot/package/minicom/minicom.hash
similarity index 100%
rename from software/package/minicom/minicom.hash
rename to buildroot/package/minicom/minicom.hash
diff --git a/software/package/minicom/minicom.mk b/buildroot/package/minicom/minicom.mk
similarity index 100%
rename from software/package/minicom/minicom.mk
rename to buildroot/package/minicom/minicom.mk
diff --git a/software/package/minidlna/0001-fix-build-with-gcc-10.patch b/buildroot/package/minidlna/0001-fix-build-with-gcc-10.patch
similarity index 100%
rename from software/package/minidlna/0001-fix-build-with-gcc-10.patch
rename to buildroot/package/minidlna/0001-fix-build-with-gcc-10.patch
diff --git a/software/package/minidlna/0002-upnphttp.c-fix-CallStranger-a.k.a.-CVE-2020-12695.patch b/buildroot/package/minidlna/0002-upnphttp.c-fix-CallStranger-a.k.a.-CVE-2020-12695.patch
similarity index 100%
rename from software/package/minidlna/0002-upnphttp.c-fix-CallStranger-a.k.a.-CVE-2020-12695.patch
rename to buildroot/package/minidlna/0002-upnphttp.c-fix-CallStranger-a.k.a.-CVE-2020-12695.patch
diff --git a/software/package/minidlna/Config.in b/buildroot/package/minidlna/Config.in
similarity index 100%
rename from software/package/minidlna/Config.in
rename to buildroot/package/minidlna/Config.in
diff --git a/software/package/minidlna/S60minidlnad b/buildroot/package/minidlna/S60minidlnad
similarity index 100%
rename from software/package/minidlna/S60minidlnad
rename to buildroot/package/minidlna/S60minidlnad
diff --git a/software/package/minidlna/minidlna.hash b/buildroot/package/minidlna/minidlna.hash
similarity index 100%
rename from software/package/minidlna/minidlna.hash
rename to buildroot/package/minidlna/minidlna.hash
diff --git a/software/package/minidlna/minidlna.mk b/buildroot/package/minidlna/minidlna.mk
similarity index 100%
rename from software/package/minidlna/minidlna.mk
rename to buildroot/package/minidlna/minidlna.mk
diff --git a/software/package/minidlna/minidlnad.service b/buildroot/package/minidlna/minidlnad.service
similarity index 100%
rename from software/package/minidlna/minidlnad.service
rename to buildroot/package/minidlna/minidlnad.service
diff --git a/software/package/minimodem/Config.in b/buildroot/package/minimodem/Config.in
similarity index 100%
rename from software/package/minimodem/Config.in
rename to buildroot/package/minimodem/Config.in
diff --git a/software/package/minimodem/minimodem.hash b/buildroot/package/minimodem/minimodem.hash
similarity index 100%
rename from software/package/minimodem/minimodem.hash
rename to buildroot/package/minimodem/minimodem.hash
diff --git a/software/package/minimodem/minimodem.mk b/buildroot/package/minimodem/minimodem.mk
similarity index 100%
rename from software/package/minimodem/minimodem.mk
rename to buildroot/package/minimodem/minimodem.mk
diff --git a/software/package/minissdpd/Config.in b/buildroot/package/minissdpd/Config.in
similarity index 100%
rename from software/package/minissdpd/Config.in
rename to buildroot/package/minissdpd/Config.in
diff --git a/software/package/minissdpd/S50minissdpd b/buildroot/package/minissdpd/S50minissdpd
similarity index 100%
rename from software/package/minissdpd/S50minissdpd
rename to buildroot/package/minissdpd/S50minissdpd
diff --git a/software/package/minissdpd/minissdpd.hash b/buildroot/package/minissdpd/minissdpd.hash
similarity index 100%
rename from software/package/minissdpd/minissdpd.hash
rename to buildroot/package/minissdpd/minissdpd.hash
diff --git a/software/package/minissdpd/minissdpd.mk b/buildroot/package/minissdpd/minissdpd.mk
similarity index 100%
rename from software/package/minissdpd/minissdpd.mk
rename to buildroot/package/minissdpd/minissdpd.mk
diff --git a/software/package/minissdpd/minissdpd.service b/buildroot/package/minissdpd/minissdpd.service
similarity index 100%
rename from software/package/minissdpd/minissdpd.service
rename to buildroot/package/minissdpd/minissdpd.service
diff --git a/software/package/minizip/Config.in b/buildroot/package/minizip/Config.in
similarity index 100%
rename from software/package/minizip/Config.in
rename to buildroot/package/minizip/Config.in
diff --git a/software/package/minizip/minizip.hash b/buildroot/package/minizip/minizip.hash
similarity index 100%
rename from software/package/minizip/minizip.hash
rename to buildroot/package/minizip/minizip.hash
diff --git a/software/package/minizip/minizip.mk b/buildroot/package/minizip/minizip.mk
similarity index 100%
rename from software/package/minizip/minizip.mk
rename to buildroot/package/minizip/minizip.mk
diff --git a/software/package/miraclecast/Config.in b/buildroot/package/miraclecast/Config.in
similarity index 100%
rename from software/package/miraclecast/Config.in
rename to buildroot/package/miraclecast/Config.in
diff --git a/software/package/miraclecast/miraclecast.hash b/buildroot/package/miraclecast/miraclecast.hash
similarity index 100%
rename from software/package/miraclecast/miraclecast.hash
rename to buildroot/package/miraclecast/miraclecast.hash
diff --git a/software/package/miraclecast/miraclecast.mk b/buildroot/package/miraclecast/miraclecast.mk
similarity index 100%
rename from software/package/miraclecast/miraclecast.mk
rename to buildroot/package/miraclecast/miraclecast.mk
diff --git a/software/package/mjpegtools/0001-PROGRAM_NOPIC-apparently-causes-problems-on-some-x86_64-systems.patch b/buildroot/package/mjpegtools/0001-PROGRAM_NOPIC-apparently-causes-problems-on-some-x86_64-systems.patch
similarity index 100%
rename from software/package/mjpegtools/0001-PROGRAM_NOPIC-apparently-causes-problems-on-some-x86_64-systems.patch
rename to buildroot/package/mjpegtools/0001-PROGRAM_NOPIC-apparently-causes-problems-on-some-x86_64-systems.patch
diff --git a/software/package/mjpegtools/Config.in b/buildroot/package/mjpegtools/Config.in
similarity index 100%
rename from software/package/mjpegtools/Config.in
rename to buildroot/package/mjpegtools/Config.in
diff --git a/software/package/mjpegtools/mjpegtools.hash b/buildroot/package/mjpegtools/mjpegtools.hash
similarity index 100%
rename from software/package/mjpegtools/mjpegtools.hash
rename to buildroot/package/mjpegtools/mjpegtools.hash
diff --git a/software/package/mjpegtools/mjpegtools.mk b/buildroot/package/mjpegtools/mjpegtools.mk
similarity index 100%
rename from software/package/mjpegtools/mjpegtools.mk
rename to buildroot/package/mjpegtools/mjpegtools.mk
diff --git a/software/package/mjpg-streamer/Config.in b/buildroot/package/mjpg-streamer/Config.in
similarity index 100%
rename from software/package/mjpg-streamer/Config.in
rename to buildroot/package/mjpg-streamer/Config.in
diff --git a/software/package/mjpg-streamer/mjpg-streamer.hash b/buildroot/package/mjpg-streamer/mjpg-streamer.hash
similarity index 100%
rename from software/package/mjpg-streamer/mjpg-streamer.hash
rename to buildroot/package/mjpg-streamer/mjpg-streamer.hash
diff --git a/software/package/mjpg-streamer/mjpg-streamer.mk b/buildroot/package/mjpg-streamer/mjpg-streamer.mk
similarity index 100%
rename from software/package/mjpg-streamer/mjpg-streamer.mk
rename to buildroot/package/mjpg-streamer/mjpg-streamer.mk
diff --git a/software/package/mkpasswd/Config.in.host b/buildroot/package/mkpasswd/Config.in.host
similarity index 100%
rename from software/package/mkpasswd/Config.in.host
rename to buildroot/package/mkpasswd/Config.in.host
diff --git a/software/package/mkpasswd/config.h b/buildroot/package/mkpasswd/config.h
similarity index 100%
rename from software/package/mkpasswd/config.h
rename to buildroot/package/mkpasswd/config.h
diff --git a/software/package/mkpasswd/mkpasswd.c b/buildroot/package/mkpasswd/mkpasswd.c
similarity index 100%
rename from software/package/mkpasswd/mkpasswd.c
rename to buildroot/package/mkpasswd/mkpasswd.c
diff --git a/software/package/mkpasswd/mkpasswd.mk b/buildroot/package/mkpasswd/mkpasswd.mk
similarity index 100%
rename from software/package/mkpasswd/mkpasswd.mk
rename to buildroot/package/mkpasswd/mkpasswd.mk
diff --git a/software/package/mkpasswd/utils.c b/buildroot/package/mkpasswd/utils.c
similarity index 100%
rename from software/package/mkpasswd/utils.c
rename to buildroot/package/mkpasswd/utils.c
diff --git a/software/package/mkpasswd/utils.h b/buildroot/package/mkpasswd/utils.h
similarity index 100%
rename from software/package/mkpasswd/utils.h
rename to buildroot/package/mkpasswd/utils.h
diff --git a/software/package/mkpimage/mkpimage.c b/buildroot/package/mkpimage/mkpimage.c
similarity index 100%
rename from software/package/mkpimage/mkpimage.c
rename to buildroot/package/mkpimage/mkpimage.c
diff --git a/software/package/mkpimage/mkpimage.mk b/buildroot/package/mkpimage/mkpimage.mk
similarity index 100%
rename from software/package/mkpimage/mkpimage.mk
rename to buildroot/package/mkpimage/mkpimage.mk
diff --git a/software/package/mksh/Config.in b/buildroot/package/mksh/Config.in
similarity index 100%
rename from software/package/mksh/Config.in
rename to buildroot/package/mksh/Config.in
diff --git a/software/package/mksh/mksh.hash b/buildroot/package/mksh/mksh.hash
similarity index 100%
rename from software/package/mksh/mksh.hash
rename to buildroot/package/mksh/mksh.hash
diff --git a/software/package/mksh/mksh.mk b/buildroot/package/mksh/mksh.mk
similarity index 100%
rename from software/package/mksh/mksh.mk
rename to buildroot/package/mksh/mksh.mk
diff --git a/software/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch b/buildroot/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
similarity index 100%
rename from software/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
rename to buildroot/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch
diff --git a/software/package/mmc-utils/Config.in b/buildroot/package/mmc-utils/Config.in
similarity index 100%
rename from software/package/mmc-utils/Config.in
rename to buildroot/package/mmc-utils/Config.in
diff --git a/software/package/mmc-utils/mmc-utils.hash b/buildroot/package/mmc-utils/mmc-utils.hash
similarity index 100%
rename from software/package/mmc-utils/mmc-utils.hash
rename to buildroot/package/mmc-utils/mmc-utils.hash
diff --git a/software/package/mmc-utils/mmc-utils.mk b/buildroot/package/mmc-utils/mmc-utils.mk
similarity index 100%
rename from software/package/mmc-utils/mmc-utils.mk
rename to buildroot/package/mmc-utils/mmc-utils.mk
diff --git a/software/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch b/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch
similarity index 100%
rename from software/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch
rename to buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch
diff --git a/software/package/moarvm/Config.in b/buildroot/package/moarvm/Config.in
similarity index 100%
rename from software/package/moarvm/Config.in
rename to buildroot/package/moarvm/Config.in
diff --git a/software/package/moarvm/moarvm.hash b/buildroot/package/moarvm/moarvm.hash
similarity index 100%
rename from software/package/moarvm/moarvm.hash
rename to buildroot/package/moarvm/moarvm.hash
diff --git a/software/package/moarvm/moarvm.mk b/buildroot/package/moarvm/moarvm.mk
similarity index 100%
rename from software/package/moarvm/moarvm.mk
rename to buildroot/package/moarvm/moarvm.mk
diff --git a/software/package/mobile-broadband-provider-info/Config.in b/buildroot/package/mobile-broadband-provider-info/Config.in
similarity index 100%
rename from software/package/mobile-broadband-provider-info/Config.in
rename to buildroot/package/mobile-broadband-provider-info/Config.in
diff --git a/software/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash
similarity index 100%
rename from software/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash
rename to buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash
diff --git a/software/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk
similarity index 100%
rename from software/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk
rename to buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk
diff --git a/software/package/modem-manager/Config.in b/buildroot/package/modem-manager/Config.in
similarity index 100%
rename from software/package/modem-manager/Config.in
rename to buildroot/package/modem-manager/Config.in
diff --git a/software/package/modem-manager/S44modem-manager b/buildroot/package/modem-manager/S44modem-manager
similarity index 100%
rename from software/package/modem-manager/S44modem-manager
rename to buildroot/package/modem-manager/S44modem-manager
diff --git a/software/package/modem-manager/modem-manager.hash b/buildroot/package/modem-manager/modem-manager.hash
similarity index 100%
rename from software/package/modem-manager/modem-manager.hash
rename to buildroot/package/modem-manager/modem-manager.hash
diff --git a/software/package/modem-manager/modem-manager.mk b/buildroot/package/modem-manager/modem-manager.mk
similarity index 100%
rename from software/package/modem-manager/modem-manager.mk
rename to buildroot/package/modem-manager/modem-manager.mk
diff --git a/software/package/modplugtools/Config.in b/buildroot/package/modplugtools/Config.in
similarity index 100%
rename from software/package/modplugtools/Config.in
rename to buildroot/package/modplugtools/Config.in
diff --git a/software/package/modplugtools/modplugtools.hash b/buildroot/package/modplugtools/modplugtools.hash
similarity index 100%
rename from software/package/modplugtools/modplugtools.hash
rename to buildroot/package/modplugtools/modplugtools.hash
diff --git a/software/package/modplugtools/modplugtools.mk b/buildroot/package/modplugtools/modplugtools.mk
similarity index 100%
rename from software/package/modplugtools/modplugtools.mk
rename to buildroot/package/modplugtools/modplugtools.mk
diff --git a/software/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch b/buildroot/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch
similarity index 100%
rename from software/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch
rename to buildroot/package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch
diff --git a/software/package/mongodb/Config.in b/buildroot/package/mongodb/Config.in
similarity index 100%
rename from software/package/mongodb/Config.in
rename to buildroot/package/mongodb/Config.in
diff --git a/software/package/mongodb/mongodb.hash b/buildroot/package/mongodb/mongodb.hash
similarity index 100%
rename from software/package/mongodb/mongodb.hash
rename to buildroot/package/mongodb/mongodb.hash
diff --git a/software/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk
similarity index 100%
rename from software/package/mongodb/mongodb.mk
rename to buildroot/package/mongodb/mongodb.mk
diff --git a/software/package/mongoose/Config.in b/buildroot/package/mongoose/Config.in
similarity index 100%
rename from software/package/mongoose/Config.in
rename to buildroot/package/mongoose/Config.in
diff --git a/software/package/mongoose/mongoose.hash b/buildroot/package/mongoose/mongoose.hash
similarity index 100%
rename from software/package/mongoose/mongoose.hash
rename to buildroot/package/mongoose/mongoose.hash
diff --git a/software/package/mongoose/mongoose.mk b/buildroot/package/mongoose/mongoose.mk
similarity index 100%
rename from software/package/mongoose/mongoose.mk
rename to buildroot/package/mongoose/mongoose.mk
diff --git a/software/package/mongrel2/0002-Do-not-run-tests.patch b/buildroot/package/mongrel2/0002-Do-not-run-tests.patch
similarity index 100%
rename from software/package/mongrel2/0002-Do-not-run-tests.patch
rename to buildroot/package/mongrel2/0002-Do-not-run-tests.patch
diff --git a/software/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch b/buildroot/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch
similarity index 100%
rename from software/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch
rename to buildroot/package/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch
diff --git a/software/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch b/buildroot/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch
similarity index 100%
rename from software/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch
rename to buildroot/package/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch
diff --git a/software/package/mongrel2/Config.in b/buildroot/package/mongrel2/Config.in
similarity index 100%
rename from software/package/mongrel2/Config.in
rename to buildroot/package/mongrel2/Config.in
diff --git a/software/package/mongrel2/mongrel2.hash b/buildroot/package/mongrel2/mongrel2.hash
similarity index 100%
rename from software/package/mongrel2/mongrel2.hash
rename to buildroot/package/mongrel2/mongrel2.hash
diff --git a/software/package/mongrel2/mongrel2.mk b/buildroot/package/mongrel2/mongrel2.mk
similarity index 100%
rename from software/package/mongrel2/mongrel2.mk
rename to buildroot/package/mongrel2/mongrel2.mk
diff --git a/software/package/monit/0001-no-force-static.patch b/buildroot/package/monit/0001-no-force-static.patch
similarity index 100%
rename from software/package/monit/0001-no-force-static.patch
rename to buildroot/package/monit/0001-no-force-static.patch
diff --git a/software/package/monit/Config.in b/buildroot/package/monit/Config.in
similarity index 100%
rename from software/package/monit/Config.in
rename to buildroot/package/monit/Config.in
diff --git a/software/package/monit/monit.hash b/buildroot/package/monit/monit.hash
similarity index 100%
rename from software/package/monit/monit.hash
rename to buildroot/package/monit/monit.hash
diff --git a/software/package/monit/monit.mk b/buildroot/package/monit/monit.mk
similarity index 100%
rename from software/package/monit/monit.mk
rename to buildroot/package/monit/monit.mk
diff --git a/software/package/monkey/Config.in b/buildroot/package/monkey/Config.in
similarity index 100%
rename from software/package/monkey/Config.in
rename to buildroot/package/monkey/Config.in
diff --git a/software/package/monkey/monkey.hash b/buildroot/package/monkey/monkey.hash
similarity index 100%
rename from software/package/monkey/monkey.hash
rename to buildroot/package/monkey/monkey.hash
diff --git a/software/package/monkey/monkey.mk b/buildroot/package/monkey/monkey.mk
similarity index 100%
rename from software/package/monkey/monkey.mk
rename to buildroot/package/monkey/monkey.mk
diff --git a/software/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch b/buildroot/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch
similarity index 100%
rename from software/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch
rename to buildroot/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch
diff --git a/software/package/mono-gtksharp3/Config.in b/buildroot/package/mono-gtksharp3/Config.in
similarity index 100%
rename from software/package/mono-gtksharp3/Config.in
rename to buildroot/package/mono-gtksharp3/Config.in
diff --git a/software/package/mono-gtksharp3/mono-gtksharp3.hash b/buildroot/package/mono-gtksharp3/mono-gtksharp3.hash
similarity index 100%
rename from software/package/mono-gtksharp3/mono-gtksharp3.hash
rename to buildroot/package/mono-gtksharp3/mono-gtksharp3.hash
diff --git a/software/package/mono-gtksharp3/mono-gtksharp3.mk b/buildroot/package/mono-gtksharp3/mono-gtksharp3.mk
similarity index 100%
rename from software/package/mono-gtksharp3/mono-gtksharp3.mk
rename to buildroot/package/mono-gtksharp3/mono-gtksharp3.mk
diff --git a/software/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch b/buildroot/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch
similarity index 100%
rename from software/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch
rename to buildroot/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch
diff --git a/software/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch b/buildroot/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch
similarity index 100%
rename from software/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch
rename to buildroot/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch
diff --git a/software/package/mono/0003-configure.ac-checks-for-libunwind.patch b/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch
similarity index 100%
rename from software/package/mono/0003-configure.ac-checks-for-libunwind.patch
rename to buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch
diff --git a/software/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch b/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch
similarity index 100%
rename from software/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch
rename to buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch
diff --git a/software/package/mono/Config.in b/buildroot/package/mono/Config.in
similarity index 100%
rename from software/package/mono/Config.in
rename to buildroot/package/mono/Config.in
diff --git a/software/package/mono/mono.hash b/buildroot/package/mono/mono.hash
similarity index 100%
rename from software/package/mono/mono.hash
rename to buildroot/package/mono/mono.hash
diff --git a/software/package/mono/mono.mk b/buildroot/package/mono/mono.mk
similarity index 100%
rename from software/package/mono/mono.mk
rename to buildroot/package/mono/mono.mk
diff --git a/software/package/monolite/monolite.hash b/buildroot/package/monolite/monolite.hash
similarity index 100%
rename from software/package/monolite/monolite.hash
rename to buildroot/package/monolite/monolite.hash
diff --git a/software/package/monolite/monolite.mk b/buildroot/package/monolite/monolite.mk
similarity index 100%
rename from software/package/monolite/monolite.mk
rename to buildroot/package/monolite/monolite.mk
diff --git a/software/package/mosh/Config.in b/buildroot/package/mosh/Config.in
similarity index 100%
rename from software/package/mosh/Config.in
rename to buildroot/package/mosh/Config.in
diff --git a/software/package/mosh/mosh.hash b/buildroot/package/mosh/mosh.hash
similarity index 100%
rename from software/package/mosh/mosh.hash
rename to buildroot/package/mosh/mosh.hash
diff --git a/software/package/mosh/mosh.mk b/buildroot/package/mosh/mosh.mk
similarity index 100%
rename from software/package/mosh/mosh.mk
rename to buildroot/package/mosh/mosh.mk
diff --git a/software/package/mosquitto/Config.in b/buildroot/package/mosquitto/Config.in
similarity index 100%
rename from software/package/mosquitto/Config.in
rename to buildroot/package/mosquitto/Config.in
diff --git a/software/package/mosquitto/S50mosquitto b/buildroot/package/mosquitto/S50mosquitto
similarity index 100%
rename from software/package/mosquitto/S50mosquitto
rename to buildroot/package/mosquitto/S50mosquitto
diff --git a/software/package/mosquitto/mosquitto.hash b/buildroot/package/mosquitto/mosquitto.hash
similarity index 100%
rename from software/package/mosquitto/mosquitto.hash
rename to buildroot/package/mosquitto/mosquitto.hash
diff --git a/software/package/mosquitto/mosquitto.mk b/buildroot/package/mosquitto/mosquitto.mk
similarity index 100%
rename from software/package/mosquitto/mosquitto.mk
rename to buildroot/package/mosquitto/mosquitto.mk
diff --git a/software/package/most/Config.in b/buildroot/package/most/Config.in
similarity index 100%
rename from software/package/most/Config.in
rename to buildroot/package/most/Config.in
diff --git a/software/package/most/most.hash b/buildroot/package/most/most.hash
similarity index 100%
rename from software/package/most/most.hash
rename to buildroot/package/most/most.hash
diff --git a/software/package/most/most.mk b/buildroot/package/most/most.mk
similarity index 100%
rename from software/package/most/most.mk
rename to buildroot/package/most/most.mk
diff --git a/software/package/motion/Config.in b/buildroot/package/motion/Config.in
similarity index 100%
rename from software/package/motion/Config.in
rename to buildroot/package/motion/Config.in
diff --git a/software/package/motion/S99motion b/buildroot/package/motion/S99motion
similarity index 100%
rename from software/package/motion/S99motion
rename to buildroot/package/motion/S99motion
diff --git a/software/package/motion/motion.hash b/buildroot/package/motion/motion.hash
similarity index 100%
rename from software/package/motion/motion.hash
rename to buildroot/package/motion/motion.hash
diff --git a/software/package/motion/motion.mk b/buildroot/package/motion/motion.mk
similarity index 100%
rename from software/package/motion/motion.mk
rename to buildroot/package/motion/motion.mk
diff --git a/software/package/motion/motion.service b/buildroot/package/motion/motion.service
similarity index 100%
rename from software/package/motion/motion.service
rename to buildroot/package/motion/motion.service
diff --git a/software/package/mp4v2/0001-Fix-GCC7-build.patch b/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch
similarity index 100%
rename from software/package/mp4v2/0001-Fix-GCC7-build.patch
rename to buildroot/package/mp4v2/0001-Fix-GCC7-build.patch
diff --git a/software/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/buildroot/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch
similarity index 100%
rename from software/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch
rename to buildroot/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch
diff --git a/software/package/mp4v2/Config.in b/buildroot/package/mp4v2/Config.in
similarity index 100%
rename from software/package/mp4v2/Config.in
rename to buildroot/package/mp4v2/Config.in
diff --git a/software/package/mp4v2/mp4v2.hash b/buildroot/package/mp4v2/mp4v2.hash
similarity index 100%
rename from software/package/mp4v2/mp4v2.hash
rename to buildroot/package/mp4v2/mp4v2.hash
diff --git a/software/package/mp4v2/mp4v2.mk b/buildroot/package/mp4v2/mp4v2.mk
similarity index 100%
rename from software/package/mp4v2/mp4v2.mk
rename to buildroot/package/mp4v2/mp4v2.mk
diff --git a/software/package/mpc/Config.in b/buildroot/package/mpc/Config.in
similarity index 100%
rename from software/package/mpc/Config.in
rename to buildroot/package/mpc/Config.in
diff --git a/software/package/mpc/mpc.hash b/buildroot/package/mpc/mpc.hash
similarity index 100%
rename from software/package/mpc/mpc.hash
rename to buildroot/package/mpc/mpc.hash
diff --git a/software/package/mpc/mpc.mk b/buildroot/package/mpc/mpc.mk
similarity index 100%
rename from software/package/mpc/mpc.mk
rename to buildroot/package/mpc/mpc.mk
diff --git a/software/package/mpd-mpc/Config.in b/buildroot/package/mpd-mpc/Config.in
similarity index 100%
rename from software/package/mpd-mpc/Config.in
rename to buildroot/package/mpd-mpc/Config.in
diff --git a/software/package/mpd-mpc/mpd-mpc.hash b/buildroot/package/mpd-mpc/mpd-mpc.hash
similarity index 100%
rename from software/package/mpd-mpc/mpd-mpc.hash
rename to buildroot/package/mpd-mpc/mpd-mpc.hash
diff --git a/software/package/mpd-mpc/mpd-mpc.mk b/buildroot/package/mpd-mpc/mpd-mpc.mk
similarity index 100%
rename from software/package/mpd-mpc/mpd-mpc.mk
rename to buildroot/package/mpd-mpc/mpd-mpc.mk
diff --git a/software/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/buildroot/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch
similarity index 100%
rename from software/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch
rename to buildroot/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch
diff --git a/software/package/mpd/Config.in b/buildroot/package/mpd/Config.in
similarity index 100%
rename from software/package/mpd/Config.in
rename to buildroot/package/mpd/Config.in
diff --git a/software/package/mpd/S95mpd b/buildroot/package/mpd/S95mpd
similarity index 100%
rename from software/package/mpd/S95mpd
rename to buildroot/package/mpd/S95mpd
diff --git a/software/package/mpd/mpd.conf b/buildroot/package/mpd/mpd.conf
similarity index 100%
rename from software/package/mpd/mpd.conf
rename to buildroot/package/mpd/mpd.conf
diff --git a/software/package/mpd/mpd.hash b/buildroot/package/mpd/mpd.hash
similarity index 100%
rename from software/package/mpd/mpd.hash
rename to buildroot/package/mpd/mpd.hash
diff --git a/software/package/mpd/mpd.mk b/buildroot/package/mpd/mpd.mk
similarity index 100%
rename from software/package/mpd/mpd.mk
rename to buildroot/package/mpd/mpd.mk
diff --git a/software/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/buildroot/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch
similarity index 100%
rename from software/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch
rename to buildroot/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch
diff --git a/software/package/mpdecimal/Config.in b/buildroot/package/mpdecimal/Config.in
similarity index 100%
rename from software/package/mpdecimal/Config.in
rename to buildroot/package/mpdecimal/Config.in
diff --git a/software/package/mpdecimal/mpdecimal.hash b/buildroot/package/mpdecimal/mpdecimal.hash
similarity index 100%
rename from software/package/mpdecimal/mpdecimal.hash
rename to buildroot/package/mpdecimal/mpdecimal.hash
diff --git a/software/package/mpdecimal/mpdecimal.mk b/buildroot/package/mpdecimal/mpdecimal.mk
similarity index 100%
rename from software/package/mpdecimal/mpdecimal.mk
rename to buildroot/package/mpdecimal/mpdecimal.mk
diff --git a/software/package/mpfr/Config.in b/buildroot/package/mpfr/Config.in
similarity index 100%
rename from software/package/mpfr/Config.in
rename to buildroot/package/mpfr/Config.in
diff --git a/software/package/mpfr/mpfr.hash b/buildroot/package/mpfr/mpfr.hash
similarity index 100%
rename from software/package/mpfr/mpfr.hash
rename to buildroot/package/mpfr/mpfr.hash
diff --git a/software/package/mpfr/mpfr.mk b/buildroot/package/mpfr/mpfr.mk
similarity index 100%
rename from software/package/mpfr/mpfr.mk
rename to buildroot/package/mpfr/mpfr.mk
diff --git a/software/package/mpg123/Config.in b/buildroot/package/mpg123/Config.in
similarity index 100%
rename from software/package/mpg123/Config.in
rename to buildroot/package/mpg123/Config.in
diff --git a/software/package/mpg123/mpg123.hash b/buildroot/package/mpg123/mpg123.hash
similarity index 100%
rename from software/package/mpg123/mpg123.hash
rename to buildroot/package/mpg123/mpg123.hash
diff --git a/software/package/mpg123/mpg123.mk b/buildroot/package/mpg123/mpg123.mk
similarity index 100%
rename from software/package/mpg123/mpg123.mk
rename to buildroot/package/mpg123/mpg123.mk
diff --git a/software/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch b/buildroot/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch
similarity index 100%
rename from software/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch
rename to buildroot/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch
diff --git a/software/package/mpir/Config.in b/buildroot/package/mpir/Config.in
similarity index 100%
rename from software/package/mpir/Config.in
rename to buildroot/package/mpir/Config.in
diff --git a/software/package/mpir/mpir.hash b/buildroot/package/mpir/mpir.hash
similarity index 100%
rename from software/package/mpir/mpir.hash
rename to buildroot/package/mpir/mpir.hash
diff --git a/software/package/mpir/mpir.mk b/buildroot/package/mpir/mpir.mk
similarity index 100%
rename from software/package/mpir/mpir.mk
rename to buildroot/package/mpir/mpir.mk
diff --git a/software/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch b/buildroot/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch
similarity index 100%
rename from software/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch
rename to buildroot/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch
diff --git a/software/package/mpv/0002-fix-powerpc64-altivec.patch b/buildroot/package/mpv/0002-fix-powerpc64-altivec.patch
similarity index 100%
rename from software/package/mpv/0002-fix-powerpc64-altivec.patch
rename to buildroot/package/mpv/0002-fix-powerpc64-altivec.patch
diff --git a/software/package/mpv/Config.in b/buildroot/package/mpv/Config.in
similarity index 100%
rename from software/package/mpv/Config.in
rename to buildroot/package/mpv/Config.in
diff --git a/software/package/mpv/mpv.hash b/buildroot/package/mpv/mpv.hash
similarity index 100%
rename from software/package/mpv/mpv.hash
rename to buildroot/package/mpv/mpv.hash
diff --git a/software/package/mpv/mpv.mk b/buildroot/package/mpv/mpv.mk
similarity index 100%
rename from software/package/mpv/mpv.mk
rename to buildroot/package/mpv/mpv.mk
diff --git a/software/package/mraa/Config.in b/buildroot/package/mraa/Config.in
similarity index 100%
rename from software/package/mraa/Config.in
rename to buildroot/package/mraa/Config.in
diff --git a/software/package/mraa/mraa.hash b/buildroot/package/mraa/mraa.hash
similarity index 100%
rename from software/package/mraa/mraa.hash
rename to buildroot/package/mraa/mraa.hash
diff --git a/software/package/mraa/mraa.mk b/buildroot/package/mraa/mraa.mk
similarity index 100%
rename from software/package/mraa/mraa.mk
rename to buildroot/package/mraa/mraa.mk
diff --git a/software/package/mrouted/Config.in b/buildroot/package/mrouted/Config.in
similarity index 100%
rename from software/package/mrouted/Config.in
rename to buildroot/package/mrouted/Config.in
diff --git a/software/package/mrouted/mrouted.hash b/buildroot/package/mrouted/mrouted.hash
similarity index 100%
rename from software/package/mrouted/mrouted.hash
rename to buildroot/package/mrouted/mrouted.hash
diff --git a/software/package/mrouted/mrouted.mk b/buildroot/package/mrouted/mrouted.mk
similarity index 100%
rename from software/package/mrouted/mrouted.mk
rename to buildroot/package/mrouted/mrouted.mk
diff --git a/software/package/msgpack/Config.in b/buildroot/package/msgpack/Config.in
similarity index 100%
rename from software/package/msgpack/Config.in
rename to buildroot/package/msgpack/Config.in
diff --git a/software/package/msgpack/msgpack.hash b/buildroot/package/msgpack/msgpack.hash
similarity index 100%
rename from software/package/msgpack/msgpack.hash
rename to buildroot/package/msgpack/msgpack.hash
diff --git a/software/package/msgpack/msgpack.mk b/buildroot/package/msgpack/msgpack.mk
similarity index 100%
rename from software/package/msgpack/msgpack.mk
rename to buildroot/package/msgpack/msgpack.mk
diff --git a/software/package/msmtp/Config.in b/buildroot/package/msmtp/Config.in
similarity index 100%
rename from software/package/msmtp/Config.in
rename to buildroot/package/msmtp/Config.in
diff --git a/software/package/msmtp/msmtp.hash b/buildroot/package/msmtp/msmtp.hash
similarity index 100%
rename from software/package/msmtp/msmtp.hash
rename to buildroot/package/msmtp/msmtp.hash
diff --git a/software/package/msmtp/msmtp.mk b/buildroot/package/msmtp/msmtp.mk
similarity index 100%
rename from software/package/msmtp/msmtp.mk
rename to buildroot/package/msmtp/msmtp.mk
diff --git a/software/package/msr-tools/Config.in b/buildroot/package/msr-tools/Config.in
similarity index 100%
rename from software/package/msr-tools/Config.in
rename to buildroot/package/msr-tools/Config.in
diff --git a/software/package/msr-tools/msr-tools.hash b/buildroot/package/msr-tools/msr-tools.hash
similarity index 100%
rename from software/package/msr-tools/msr-tools.hash
rename to buildroot/package/msr-tools/msr-tools.hash
diff --git a/software/package/msr-tools/msr-tools.mk b/buildroot/package/msr-tools/msr-tools.mk
similarity index 100%
rename from software/package/msr-tools/msr-tools.mk
rename to buildroot/package/msr-tools/msr-tools.mk
diff --git a/software/package/mtd/Config.in b/buildroot/package/mtd/Config.in
similarity index 100%
rename from software/package/mtd/Config.in
rename to buildroot/package/mtd/Config.in
diff --git a/software/package/mtd/Config.in.host b/buildroot/package/mtd/Config.in.host
similarity index 100%
rename from software/package/mtd/Config.in.host
rename to buildroot/package/mtd/Config.in.host
diff --git a/software/package/mtd/mtd.hash b/buildroot/package/mtd/mtd.hash
similarity index 100%
rename from software/package/mtd/mtd.hash
rename to buildroot/package/mtd/mtd.hash
diff --git a/software/package/mtd/mtd.mk b/buildroot/package/mtd/mtd.mk
similarity index 100%
rename from software/package/mtd/mtd.mk
rename to buildroot/package/mtd/mtd.mk
diff --git a/software/package/mtdev/Config.in b/buildroot/package/mtdev/Config.in
similarity index 100%
rename from software/package/mtdev/Config.in
rename to buildroot/package/mtdev/Config.in
diff --git a/software/package/mtdev/mtdev.hash b/buildroot/package/mtdev/mtdev.hash
similarity index 100%
rename from software/package/mtdev/mtdev.hash
rename to buildroot/package/mtdev/mtdev.hash
diff --git a/software/package/mtdev/mtdev.mk b/buildroot/package/mtdev/mtdev.mk
similarity index 100%
rename from software/package/mtdev/mtdev.mk
rename to buildroot/package/mtdev/mtdev.mk
diff --git a/software/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch b/buildroot/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch
similarity index 100%
rename from software/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch
rename to buildroot/package/mtdev2tuio/0001-Fix-build-with-musl-libc.patch
diff --git a/software/package/mtdev2tuio/Config.in b/buildroot/package/mtdev2tuio/Config.in
similarity index 100%
rename from software/package/mtdev2tuio/Config.in
rename to buildroot/package/mtdev2tuio/Config.in
diff --git a/software/package/mtdev2tuio/mtdev2tuio.hash b/buildroot/package/mtdev2tuio/mtdev2tuio.hash
similarity index 100%
rename from software/package/mtdev2tuio/mtdev2tuio.hash
rename to buildroot/package/mtdev2tuio/mtdev2tuio.hash
diff --git a/software/package/mtdev2tuio/mtdev2tuio.mk b/buildroot/package/mtdev2tuio/mtdev2tuio.mk
similarity index 100%
rename from software/package/mtdev2tuio/mtdev2tuio.mk
rename to buildroot/package/mtdev2tuio/mtdev2tuio.mk
diff --git a/software/package/mtools/Config.in b/buildroot/package/mtools/Config.in
similarity index 100%
rename from software/package/mtools/Config.in
rename to buildroot/package/mtools/Config.in
diff --git a/software/package/mtools/Config.in.host b/buildroot/package/mtools/Config.in.host
similarity index 100%
rename from software/package/mtools/Config.in.host
rename to buildroot/package/mtools/Config.in.host
diff --git a/software/package/mtools/mtools.hash b/buildroot/package/mtools/mtools.hash
similarity index 100%
rename from software/package/mtools/mtools.hash
rename to buildroot/package/mtools/mtools.hash
diff --git a/software/package/mtools/mtools.mk b/buildroot/package/mtools/mtools.mk
similarity index 100%
rename from software/package/mtools/mtools.mk
rename to buildroot/package/mtools/mtools.mk
diff --git a/software/package/mtr/Config.in b/buildroot/package/mtr/Config.in
similarity index 100%
rename from software/package/mtr/Config.in
rename to buildroot/package/mtr/Config.in
diff --git a/software/package/mtr/mtr.hash b/buildroot/package/mtr/mtr.hash
similarity index 100%
rename from software/package/mtr/mtr.hash
rename to buildroot/package/mtr/mtr.hash
diff --git a/software/package/mtr/mtr.mk b/buildroot/package/mtr/mtr.mk
similarity index 100%
rename from software/package/mtr/mtr.mk
rename to buildroot/package/mtr/mtr.mk
diff --git a/software/package/multicat/Config.in b/buildroot/package/multicat/Config.in
similarity index 100%
rename from software/package/multicat/Config.in
rename to buildroot/package/multicat/Config.in
diff --git a/software/package/multicat/multicat.hash b/buildroot/package/multicat/multicat.hash
similarity index 100%
rename from software/package/multicat/multicat.hash
rename to buildroot/package/multicat/multicat.hash
diff --git a/software/package/multicat/multicat.mk b/buildroot/package/multicat/multicat.mk
similarity index 100%
rename from software/package/multicat/multicat.mk
rename to buildroot/package/multicat/multicat.mk
diff --git a/software/package/murata-cyw-fw/Config.in b/buildroot/package/murata-cyw-fw/Config.in
similarity index 100%
rename from software/package/murata-cyw-fw/Config.in
rename to buildroot/package/murata-cyw-fw/Config.in
diff --git a/software/package/murata-cyw-fw/murata-cyw-fw.hash b/buildroot/package/murata-cyw-fw/murata-cyw-fw.hash
similarity index 100%
rename from software/package/murata-cyw-fw/murata-cyw-fw.hash
rename to buildroot/package/murata-cyw-fw/murata-cyw-fw.hash
diff --git a/software/package/murata-cyw-fw/murata-cyw-fw.mk b/buildroot/package/murata-cyw-fw/murata-cyw-fw.mk
similarity index 100%
rename from software/package/murata-cyw-fw/murata-cyw-fw.mk
rename to buildroot/package/murata-cyw-fw/murata-cyw-fw.mk
diff --git a/software/package/musepack/0001-shared.patch b/buildroot/package/musepack/0001-shared.patch
similarity index 100%
rename from software/package/musepack/0001-shared.patch
rename to buildroot/package/musepack/0001-shared.patch
diff --git a/software/package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/buildroot/package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
similarity index 100%
rename from software/package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
rename to buildroot/package/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
diff --git a/software/package/musepack/0003-include-fpu-control-with-glibc-only.patch b/buildroot/package/musepack/0003-include-fpu-control-with-glibc-only.patch
similarity index 100%
rename from software/package/musepack/0003-include-fpu-control-with-glibc-only.patch
rename to buildroot/package/musepack/0003-include-fpu-control-with-glibc-only.patch
diff --git a/software/package/musepack/0004-missing-sys-select.patch b/buildroot/package/musepack/0004-missing-sys-select.patch
similarity index 100%
rename from software/package/musepack/0004-missing-sys-select.patch
rename to buildroot/package/musepack/0004-missing-sys-select.patch
diff --git a/software/package/musepack/Config.in b/buildroot/package/musepack/Config.in
similarity index 100%
rename from software/package/musepack/Config.in
rename to buildroot/package/musepack/Config.in
diff --git a/software/package/musepack/musepack.hash b/buildroot/package/musepack/musepack.hash
similarity index 100%
rename from software/package/musepack/musepack.hash
rename to buildroot/package/musepack/musepack.hash
diff --git a/software/package/musepack/musepack.mk b/buildroot/package/musepack/musepack.mk
similarity index 100%
rename from software/package/musepack/musepack.mk
rename to buildroot/package/musepack/musepack.mk
diff --git a/software/package/musl-compat-headers/Config.in b/buildroot/package/musl-compat-headers/Config.in
similarity index 100%
rename from software/package/musl-compat-headers/Config.in
rename to buildroot/package/musl-compat-headers/Config.in
diff --git a/software/package/musl-compat-headers/cdefs.h b/buildroot/package/musl-compat-headers/cdefs.h
similarity index 100%
rename from software/package/musl-compat-headers/cdefs.h
rename to buildroot/package/musl-compat-headers/cdefs.h
diff --git a/software/package/musl-compat-headers/musl-compat-headers.hash b/buildroot/package/musl-compat-headers/musl-compat-headers.hash
similarity index 100%
rename from software/package/musl-compat-headers/musl-compat-headers.hash
rename to buildroot/package/musl-compat-headers/musl-compat-headers.hash
diff --git a/software/package/musl-compat-headers/musl-compat-headers.mk b/buildroot/package/musl-compat-headers/musl-compat-headers.mk
similarity index 100%
rename from software/package/musl-compat-headers/musl-compat-headers.mk
rename to buildroot/package/musl-compat-headers/musl-compat-headers.mk
diff --git a/software/package/musl-fts/Config.in b/buildroot/package/musl-fts/Config.in
similarity index 100%
rename from software/package/musl-fts/Config.in
rename to buildroot/package/musl-fts/Config.in
diff --git a/software/package/musl-fts/musl-fts.hash b/buildroot/package/musl-fts/musl-fts.hash
similarity index 100%
rename from software/package/musl-fts/musl-fts.hash
rename to buildroot/package/musl-fts/musl-fts.hash
diff --git a/software/package/musl-fts/musl-fts.mk b/buildroot/package/musl-fts/musl-fts.mk
similarity index 100%
rename from software/package/musl-fts/musl-fts.mk
rename to buildroot/package/musl-fts/musl-fts.mk
diff --git a/software/package/musl/0001-avoid-kernel-if_ether.h.patch b/buildroot/package/musl/0001-avoid-kernel-if_ether.h.patch
similarity index 100%
rename from software/package/musl/0001-avoid-kernel-if_ether.h.patch
rename to buildroot/package/musl/0001-avoid-kernel-if_ether.h.patch
diff --git a/software/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch b/buildroot/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch
similarity index 100%
rename from software/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch
rename to buildroot/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch
diff --git a/software/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch b/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch
similarity index 100%
rename from software/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch
rename to buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch
diff --git a/software/package/musl/Config.in b/buildroot/package/musl/Config.in
similarity index 100%
rename from software/package/musl/Config.in
rename to buildroot/package/musl/Config.in
diff --git a/software/package/musl/musl.hash b/buildroot/package/musl/musl.hash
similarity index 100%
rename from software/package/musl/musl.hash
rename to buildroot/package/musl/musl.hash
diff --git a/software/package/musl/musl.mk b/buildroot/package/musl/musl.mk
similarity index 100%
rename from software/package/musl/musl.mk
rename to buildroot/package/musl/musl.mk
diff --git a/software/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch b/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch
similarity index 100%
rename from software/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch
rename to buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch
diff --git a/software/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch b/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch
similarity index 100%
rename from software/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch
rename to buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch
diff --git a/software/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch b/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch
similarity index 100%
rename from software/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch
rename to buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch
diff --git a/software/package/mutt/Config.in b/buildroot/package/mutt/Config.in
similarity index 100%
rename from software/package/mutt/Config.in
rename to buildroot/package/mutt/Config.in
diff --git a/software/package/mutt/mutt.hash b/buildroot/package/mutt/mutt.hash
similarity index 100%
rename from software/package/mutt/mutt.hash
rename to buildroot/package/mutt/mutt.hash
diff --git a/software/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk
similarity index 100%
rename from software/package/mutt/mutt.mk
rename to buildroot/package/mutt/mutt.mk
diff --git a/software/package/mxml/Config.in b/buildroot/package/mxml/Config.in
similarity index 100%
rename from software/package/mxml/Config.in
rename to buildroot/package/mxml/Config.in
diff --git a/software/package/mxml/mxml.hash b/buildroot/package/mxml/mxml.hash
similarity index 100%
rename from software/package/mxml/mxml.hash
rename to buildroot/package/mxml/mxml.hash
diff --git a/software/package/mxml/mxml.mk b/buildroot/package/mxml/mxml.mk
similarity index 100%
rename from software/package/mxml/mxml.mk
rename to buildroot/package/mxml/mxml.mk
diff --git a/software/package/mxsldr/Config.in.host b/buildroot/package/mxsldr/Config.in.host
similarity index 100%
rename from software/package/mxsldr/Config.in.host
rename to buildroot/package/mxsldr/Config.in.host
diff --git a/software/package/mxsldr/mxsldr.mk b/buildroot/package/mxsldr/mxsldr.mk
similarity index 100%
rename from software/package/mxsldr/mxsldr.mk
rename to buildroot/package/mxsldr/mxsldr.mk
diff --git a/software/package/mysql/Config.in b/buildroot/package/mysql/Config.in
similarity index 100%
rename from software/package/mysql/Config.in
rename to buildroot/package/mysql/Config.in
diff --git a/software/package/mysql/mysql.mk b/buildroot/package/mysql/mysql.mk
similarity index 100%
rename from software/package/mysql/mysql.mk
rename to buildroot/package/mysql/mysql.mk
diff --git a/software/package/nano/Config.in b/buildroot/package/nano/Config.in
similarity index 100%
rename from software/package/nano/Config.in
rename to buildroot/package/nano/Config.in
diff --git a/software/package/nano/nano.hash b/buildroot/package/nano/nano.hash
similarity index 100%
rename from software/package/nano/nano.hash
rename to buildroot/package/nano/nano.hash
diff --git a/software/package/nano/nano.mk b/buildroot/package/nano/nano.mk
similarity index 100%
rename from software/package/nano/nano.mk
rename to buildroot/package/nano/nano.mk
diff --git a/software/package/nanocom/Config.in b/buildroot/package/nanocom/Config.in
similarity index 100%
rename from software/package/nanocom/Config.in
rename to buildroot/package/nanocom/Config.in
diff --git a/software/package/nanocom/nanocom.hash b/buildroot/package/nanocom/nanocom.hash
similarity index 100%
rename from software/package/nanocom/nanocom.hash
rename to buildroot/package/nanocom/nanocom.hash
diff --git a/software/package/nanocom/nanocom.mk b/buildroot/package/nanocom/nanocom.mk
similarity index 100%
rename from software/package/nanocom/nanocom.mk
rename to buildroot/package/nanocom/nanocom.mk
diff --git a/software/package/nanomsg/Config.in b/buildroot/package/nanomsg/Config.in
similarity index 100%
rename from software/package/nanomsg/Config.in
rename to buildroot/package/nanomsg/Config.in
diff --git a/software/package/nanomsg/nanomsg.hash b/buildroot/package/nanomsg/nanomsg.hash
similarity index 100%
rename from software/package/nanomsg/nanomsg.hash
rename to buildroot/package/nanomsg/nanomsg.hash
diff --git a/software/package/nanomsg/nanomsg.mk b/buildroot/package/nanomsg/nanomsg.mk
similarity index 100%
rename from software/package/nanomsg/nanomsg.mk
rename to buildroot/package/nanomsg/nanomsg.mk
diff --git a/software/package/nasm/nasm.hash b/buildroot/package/nasm/nasm.hash
similarity index 100%
rename from software/package/nasm/nasm.hash
rename to buildroot/package/nasm/nasm.hash
diff --git a/software/package/nasm/nasm.mk b/buildroot/package/nasm/nasm.mk
similarity index 100%
rename from software/package/nasm/nasm.mk
rename to buildroot/package/nasm/nasm.mk
diff --git a/software/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch b/buildroot/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch
similarity index 100%
rename from software/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch
rename to buildroot/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch
diff --git a/software/package/nbd/Config.in b/buildroot/package/nbd/Config.in
similarity index 100%
rename from software/package/nbd/Config.in
rename to buildroot/package/nbd/Config.in
diff --git a/software/package/nbd/nbd.hash b/buildroot/package/nbd/nbd.hash
similarity index 100%
rename from software/package/nbd/nbd.hash
rename to buildroot/package/nbd/nbd.hash
diff --git a/software/package/nbd/nbd.mk b/buildroot/package/nbd/nbd.mk
similarity index 100%
rename from software/package/nbd/nbd.mk
rename to buildroot/package/nbd/nbd.mk
diff --git a/software/package/ncdu/Config.in b/buildroot/package/ncdu/Config.in
similarity index 100%
rename from software/package/ncdu/Config.in
rename to buildroot/package/ncdu/Config.in
diff --git a/software/package/ncdu/ncdu.hash b/buildroot/package/ncdu/ncdu.hash
similarity index 100%
rename from software/package/ncdu/ncdu.hash
rename to buildroot/package/ncdu/ncdu.hash
diff --git a/software/package/ncdu/ncdu.mk b/buildroot/package/ncdu/ncdu.mk
similarity index 100%
rename from software/package/ncdu/ncdu.mk
rename to buildroot/package/ncdu/ncdu.mk
diff --git a/software/package/ncftp/Config.in b/buildroot/package/ncftp/Config.in
similarity index 100%
rename from software/package/ncftp/Config.in
rename to buildroot/package/ncftp/Config.in
diff --git a/software/package/ncftp/ncftp.hash b/buildroot/package/ncftp/ncftp.hash
similarity index 100%
rename from software/package/ncftp/ncftp.hash
rename to buildroot/package/ncftp/ncftp.hash
diff --git a/software/package/ncftp/ncftp.mk b/buildroot/package/ncftp/ncftp.mk
similarity index 100%
rename from software/package/ncftp/ncftp.mk
rename to buildroot/package/ncftp/ncftp.mk
diff --git a/software/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch b/buildroot/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
similarity index 100%
rename from software/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
rename to buildroot/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
diff --git a/software/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch b/buildroot/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
similarity index 100%
rename from software/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
rename to buildroot/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
diff --git a/software/package/ncmpc/Config.in b/buildroot/package/ncmpc/Config.in
similarity index 100%
rename from software/package/ncmpc/Config.in
rename to buildroot/package/ncmpc/Config.in
diff --git a/software/package/ncmpc/ncmpc.hash b/buildroot/package/ncmpc/ncmpc.hash
similarity index 100%
rename from software/package/ncmpc/ncmpc.hash
rename to buildroot/package/ncmpc/ncmpc.hash
diff --git a/software/package/ncmpc/ncmpc.mk b/buildroot/package/ncmpc/ncmpc.mk
similarity index 100%
rename from software/package/ncmpc/ncmpc.mk
rename to buildroot/package/ncmpc/ncmpc.mk
diff --git a/software/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/buildroot/package/ncurses/0001-gcc-5.x-MKlib_gen.patch
similarity index 100%
rename from software/package/ncurses/0001-gcc-5.x-MKlib_gen.patch
rename to buildroot/package/ncurses/0001-gcc-5.x-MKlib_gen.patch
diff --git a/software/package/ncurses/Config.in b/buildroot/package/ncurses/Config.in
similarity index 100%
rename from software/package/ncurses/Config.in
rename to buildroot/package/ncurses/Config.in
diff --git a/software/package/ncurses/ncurses.hash b/buildroot/package/ncurses/ncurses.hash
similarity index 100%
rename from software/package/ncurses/ncurses.hash
rename to buildroot/package/ncurses/ncurses.hash
diff --git a/software/package/ncurses/ncurses.mk b/buildroot/package/ncurses/ncurses.mk
similarity index 100%
rename from software/package/ncurses/ncurses.mk
rename to buildroot/package/ncurses/ncurses.mk
diff --git a/software/package/ndisc6/0001-Fix-musl-build.patch b/buildroot/package/ndisc6/0001-Fix-musl-build.patch
similarity index 100%
rename from software/package/ndisc6/0001-Fix-musl-build.patch
rename to buildroot/package/ndisc6/0001-Fix-musl-build.patch
diff --git a/software/package/ndisc6/Config.in b/buildroot/package/ndisc6/Config.in
similarity index 100%
rename from software/package/ndisc6/Config.in
rename to buildroot/package/ndisc6/Config.in
diff --git a/software/package/ndisc6/ndisc6.hash b/buildroot/package/ndisc6/ndisc6.hash
similarity index 100%
rename from software/package/ndisc6/ndisc6.hash
rename to buildroot/package/ndisc6/ndisc6.hash
diff --git a/software/package/ndisc6/ndisc6.mk b/buildroot/package/ndisc6/ndisc6.mk
similarity index 100%
rename from software/package/ndisc6/ndisc6.mk
rename to buildroot/package/ndisc6/ndisc6.mk
diff --git a/software/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch b/buildroot/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
similarity index 100%
rename from software/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
rename to buildroot/package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch
diff --git a/software/package/ne10/Config.in b/buildroot/package/ne10/Config.in
similarity index 100%
rename from software/package/ne10/Config.in
rename to buildroot/package/ne10/Config.in
diff --git a/software/package/ne10/ne10.hash b/buildroot/package/ne10/ne10.hash
similarity index 100%
rename from software/package/ne10/ne10.hash
rename to buildroot/package/ne10/ne10.hash
diff --git a/software/package/ne10/ne10.mk b/buildroot/package/ne10/ne10.mk
similarity index 100%
rename from software/package/ne10/ne10.mk
rename to buildroot/package/ne10/ne10.mk
diff --git a/software/package/neard/Config.in b/buildroot/package/neard/Config.in
similarity index 100%
rename from software/package/neard/Config.in
rename to buildroot/package/neard/Config.in
diff --git a/software/package/neard/S53neard b/buildroot/package/neard/S53neard
similarity index 100%
rename from software/package/neard/S53neard
rename to buildroot/package/neard/S53neard
diff --git a/software/package/neard/neard.hash b/buildroot/package/neard/neard.hash
similarity index 100%
rename from software/package/neard/neard.hash
rename to buildroot/package/neard/neard.hash
diff --git a/software/package/neard/neard.mk b/buildroot/package/neard/neard.mk
similarity index 100%
rename from software/package/neard/neard.mk
rename to buildroot/package/neard/neard.mk
diff --git a/software/package/neardal/Config.in b/buildroot/package/neardal/Config.in
similarity index 100%
rename from software/package/neardal/Config.in
rename to buildroot/package/neardal/Config.in
diff --git a/software/package/neardal/neardal.hash b/buildroot/package/neardal/neardal.hash
similarity index 100%
rename from software/package/neardal/neardal.hash
rename to buildroot/package/neardal/neardal.hash
diff --git a/software/package/neardal/neardal.mk b/buildroot/package/neardal/neardal.mk
similarity index 100%
rename from software/package/neardal/neardal.mk
rename to buildroot/package/neardal/neardal.mk
diff --git a/software/package/neon/Config.in b/buildroot/package/neon/Config.in
similarity index 100%
rename from software/package/neon/Config.in
rename to buildroot/package/neon/Config.in
diff --git a/software/package/neon/neon.hash b/buildroot/package/neon/neon.hash
similarity index 100%
rename from software/package/neon/neon.hash
rename to buildroot/package/neon/neon.hash
diff --git a/software/package/neon/neon.mk b/buildroot/package/neon/neon.mk
similarity index 100%
rename from software/package/neon/neon.mk
rename to buildroot/package/neon/neon.mk
diff --git a/software/package/net-tools/Config.in b/buildroot/package/net-tools/Config.in
similarity index 100%
rename from software/package/net-tools/Config.in
rename to buildroot/package/net-tools/Config.in
diff --git a/software/package/net-tools/net-tools.hash b/buildroot/package/net-tools/net-tools.hash
similarity index 100%
rename from software/package/net-tools/net-tools.hash
rename to buildroot/package/net-tools/net-tools.hash
diff --git a/software/package/net-tools/net-tools.mk b/buildroot/package/net-tools/net-tools.mk
similarity index 100%
rename from software/package/net-tools/net-tools.mk
rename to buildroot/package/net-tools/net-tools.mk
diff --git a/software/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch b/buildroot/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
similarity index 100%
rename from software/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
rename to buildroot/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
diff --git a/software/package/netatalk/Config.in b/buildroot/package/netatalk/Config.in
similarity index 100%
rename from software/package/netatalk/Config.in
rename to buildroot/package/netatalk/Config.in
diff --git a/software/package/netatalk/S50netatalk b/buildroot/package/netatalk/S50netatalk
similarity index 100%
rename from software/package/netatalk/S50netatalk
rename to buildroot/package/netatalk/S50netatalk
diff --git a/software/package/netatalk/netatalk.hash b/buildroot/package/netatalk/netatalk.hash
similarity index 100%
rename from software/package/netatalk/netatalk.hash
rename to buildroot/package/netatalk/netatalk.hash
diff --git a/software/package/netatalk/netatalk.mk b/buildroot/package/netatalk/netatalk.mk
similarity index 100%
rename from software/package/netatalk/netatalk.mk
rename to buildroot/package/netatalk/netatalk.mk
diff --git a/software/package/netcat-openbsd/Config.in b/buildroot/package/netcat-openbsd/Config.in
similarity index 100%
rename from software/package/netcat-openbsd/Config.in
rename to buildroot/package/netcat-openbsd/Config.in
diff --git a/software/package/netcat-openbsd/netcat-openbsd.hash b/buildroot/package/netcat-openbsd/netcat-openbsd.hash
similarity index 100%
rename from software/package/netcat-openbsd/netcat-openbsd.hash
rename to buildroot/package/netcat-openbsd/netcat-openbsd.hash
diff --git a/software/package/netcat-openbsd/netcat-openbsd.mk b/buildroot/package/netcat-openbsd/netcat-openbsd.mk
similarity index 100%
rename from software/package/netcat-openbsd/netcat-openbsd.mk
rename to buildroot/package/netcat-openbsd/netcat-openbsd.mk
diff --git a/software/package/netcat/0001-signed-bit-counting.patch b/buildroot/package/netcat/0001-signed-bit-counting.patch
similarity index 100%
rename from software/package/netcat/0001-signed-bit-counting.patch
rename to buildroot/package/netcat/0001-signed-bit-counting.patch
diff --git a/software/package/netcat/Config.in b/buildroot/package/netcat/Config.in
similarity index 100%
rename from software/package/netcat/Config.in
rename to buildroot/package/netcat/Config.in
diff --git a/software/package/netcat/netcat.hash b/buildroot/package/netcat/netcat.hash
similarity index 100%
rename from software/package/netcat/netcat.hash
rename to buildroot/package/netcat/netcat.hash
diff --git a/software/package/netcat/netcat.mk b/buildroot/package/netcat/netcat.mk
similarity index 100%
rename from software/package/netcat/netcat.mk
rename to buildroot/package/netcat/netcat.mk
diff --git a/software/package/netifrc/Config.in b/buildroot/package/netifrc/Config.in
similarity index 100%
rename from software/package/netifrc/Config.in
rename to buildroot/package/netifrc/Config.in
diff --git a/software/package/netifrc/netifrc.hash b/buildroot/package/netifrc/netifrc.hash
similarity index 100%
rename from software/package/netifrc/netifrc.hash
rename to buildroot/package/netifrc/netifrc.hash
diff --git a/software/package/netifrc/netifrc.mk b/buildroot/package/netifrc/netifrc.mk
similarity index 100%
rename from software/package/netifrc/netifrc.mk
rename to buildroot/package/netifrc/netifrc.mk
diff --git a/software/package/netperf/Config.in b/buildroot/package/netperf/Config.in
similarity index 100%
rename from software/package/netperf/Config.in
rename to buildroot/package/netperf/Config.in
diff --git a/software/package/netperf/netperf.hash b/buildroot/package/netperf/netperf.hash
similarity index 100%
rename from software/package/netperf/netperf.hash
rename to buildroot/package/netperf/netperf.hash
diff --git a/software/package/netperf/netperf.mk b/buildroot/package/netperf/netperf.mk
similarity index 100%
rename from software/package/netperf/netperf.mk
rename to buildroot/package/netperf/netperf.mk
diff --git a/software/package/netplug/0001-makefile-flags.patch b/buildroot/package/netplug/0001-makefile-flags.patch
similarity index 100%
rename from software/package/netplug/0001-makefile-flags.patch
rename to buildroot/package/netplug/0001-makefile-flags.patch
diff --git a/software/package/netplug/0002-add-missing-time-include.patch b/buildroot/package/netplug/0002-add-missing-time-include.patch
similarity index 100%
rename from software/package/netplug/0002-add-missing-time-include.patch
rename to buildroot/package/netplug/0002-add-missing-time-include.patch
diff --git a/software/package/netplug/0003-remove-assert-fail.patch b/buildroot/package/netplug/0003-remove-assert-fail.patch
similarity index 100%
rename from software/package/netplug/0003-remove-assert-fail.patch
rename to buildroot/package/netplug/0003-remove-assert-fail.patch
diff --git a/software/package/netplug/Config.in b/buildroot/package/netplug/Config.in
similarity index 100%
rename from software/package/netplug/Config.in
rename to buildroot/package/netplug/Config.in
diff --git a/software/package/netplug/S29netplug b/buildroot/package/netplug/S29netplug
similarity index 100%
rename from software/package/netplug/S29netplug
rename to buildroot/package/netplug/S29netplug
diff --git a/software/package/netplug/netplug-script b/buildroot/package/netplug/netplug-script
similarity index 100%
rename from software/package/netplug/netplug-script
rename to buildroot/package/netplug/netplug-script
diff --git a/software/package/netplug/netplug.hash b/buildroot/package/netplug/netplug.hash
similarity index 100%
rename from software/package/netplug/netplug.hash
rename to buildroot/package/netplug/netplug.hash
diff --git a/software/package/netplug/netplug.mk b/buildroot/package/netplug/netplug.mk
similarity index 100%
rename from software/package/netplug/netplug.mk
rename to buildroot/package/netplug/netplug.mk
diff --git a/software/package/netplug/netplug.service b/buildroot/package/netplug/netplug.service
similarity index 100%
rename from software/package/netplug/netplug.service
rename to buildroot/package/netplug/netplug.service
diff --git a/software/package/netsniff-ng/Config.in b/buildroot/package/netsniff-ng/Config.in
similarity index 100%
rename from software/package/netsniff-ng/Config.in
rename to buildroot/package/netsniff-ng/Config.in
diff --git a/software/package/netsniff-ng/netsniff-ng.hash b/buildroot/package/netsniff-ng/netsniff-ng.hash
similarity index 100%
rename from software/package/netsniff-ng/netsniff-ng.hash
rename to buildroot/package/netsniff-ng/netsniff-ng.hash
diff --git a/software/package/netsniff-ng/netsniff-ng.mk b/buildroot/package/netsniff-ng/netsniff-ng.mk
similarity index 100%
rename from software/package/netsniff-ng/netsniff-ng.mk
rename to buildroot/package/netsniff-ng/netsniff-ng.mk
diff --git a/software/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/buildroot/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch
similarity index 100%
rename from software/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch
rename to buildroot/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch
diff --git a/software/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/buildroot/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch
similarity index 100%
rename from software/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch
rename to buildroot/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch
diff --git a/software/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch b/buildroot/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch
similarity index 100%
rename from software/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch
rename to buildroot/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch
diff --git a/software/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/buildroot/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch
similarity index 100%
rename from software/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch
rename to buildroot/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch
diff --git a/software/package/netsnmp/Config.in b/buildroot/package/netsnmp/Config.in
similarity index 100%
rename from software/package/netsnmp/Config.in
rename to buildroot/package/netsnmp/Config.in
diff --git a/software/package/netsnmp/S59snmpd b/buildroot/package/netsnmp/S59snmpd
similarity index 100%
rename from software/package/netsnmp/S59snmpd
rename to buildroot/package/netsnmp/S59snmpd
diff --git a/software/package/netsnmp/netsnmp.hash b/buildroot/package/netsnmp/netsnmp.hash
similarity index 100%
rename from software/package/netsnmp/netsnmp.hash
rename to buildroot/package/netsnmp/netsnmp.hash
diff --git a/software/package/netsnmp/netsnmp.mk b/buildroot/package/netsnmp/netsnmp.mk
similarity index 100%
rename from software/package/netsnmp/netsnmp.mk
rename to buildroot/package/netsnmp/netsnmp.mk
diff --git a/software/package/netstat-nat/Config.in b/buildroot/package/netstat-nat/Config.in
similarity index 100%
rename from software/package/netstat-nat/Config.in
rename to buildroot/package/netstat-nat/Config.in
diff --git a/software/package/netstat-nat/netstat-nat.hash b/buildroot/package/netstat-nat/netstat-nat.hash
similarity index 100%
rename from software/package/netstat-nat/netstat-nat.hash
rename to buildroot/package/netstat-nat/netstat-nat.hash
diff --git a/software/package/netstat-nat/netstat-nat.mk b/buildroot/package/netstat-nat/netstat-nat.mk
similarity index 100%
rename from software/package/netstat-nat/netstat-nat.mk
rename to buildroot/package/netstat-nat/netstat-nat.mk
diff --git a/software/package/netsurf-buildsystem/netsurf-buildsystem.hash b/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash
similarity index 100%
rename from software/package/netsurf-buildsystem/netsurf-buildsystem.hash
rename to buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash
diff --git a/software/package/netsurf-buildsystem/netsurf-buildsystem.mk b/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.mk
similarity index 100%
rename from software/package/netsurf-buildsystem/netsurf-buildsystem.mk
rename to buildroot/package/netsurf-buildsystem/netsurf-buildsystem.mk
diff --git a/software/package/netsurf/0001-avoid-system-perl-dependencies.patch b/buildroot/package/netsurf/0001-avoid-system-perl-dependencies.patch
similarity index 100%
rename from software/package/netsurf/0001-avoid-system-perl-dependencies.patch
rename to buildroot/package/netsurf/0001-avoid-system-perl-dependencies.patch
diff --git a/software/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch b/buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch
similarity index 100%
rename from software/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch
rename to buildroot/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch
diff --git a/software/package/netsurf/0004-fix-compilation-without-curl.patch b/buildroot/package/netsurf/0004-fix-compilation-without-curl.patch
similarity index 100%
rename from software/package/netsurf/0004-fix-compilation-without-curl.patch
rename to buildroot/package/netsurf/0004-fix-compilation-without-curl.patch
diff --git a/software/package/netsurf/Config.in b/buildroot/package/netsurf/Config.in
similarity index 100%
rename from software/package/netsurf/Config.in
rename to buildroot/package/netsurf/Config.in
diff --git a/software/package/netsurf/netsurf.hash b/buildroot/package/netsurf/netsurf.hash
similarity index 100%
rename from software/package/netsurf/netsurf.hash
rename to buildroot/package/netsurf/netsurf.hash
diff --git a/software/package/netsurf/netsurf.mk b/buildroot/package/netsurf/netsurf.mk
similarity index 100%
rename from software/package/netsurf/netsurf.mk
rename to buildroot/package/netsurf/netsurf.mk
diff --git a/software/package/nettle/0001-disable-testsuite-examples.patch b/buildroot/package/nettle/0001-disable-testsuite-examples.patch
similarity index 100%
rename from software/package/nettle/0001-disable-testsuite-examples.patch
rename to buildroot/package/nettle/0001-disable-testsuite-examples.patch
diff --git a/software/package/nettle/Config.in b/buildroot/package/nettle/Config.in
similarity index 100%
rename from software/package/nettle/Config.in
rename to buildroot/package/nettle/Config.in
diff --git a/software/package/nettle/nettle.hash b/buildroot/package/nettle/nettle.hash
similarity index 100%
rename from software/package/nettle/nettle.hash
rename to buildroot/package/nettle/nettle.hash
diff --git a/software/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk
similarity index 100%
rename from software/package/nettle/nettle.mk
rename to buildroot/package/nettle/nettle.mk
diff --git a/software/package/network-manager-openvpn/Config.in b/buildroot/package/network-manager-openvpn/Config.in
similarity index 100%
rename from software/package/network-manager-openvpn/Config.in
rename to buildroot/package/network-manager-openvpn/Config.in
diff --git a/software/package/network-manager-openvpn/network-manager-openvpn.hash b/buildroot/package/network-manager-openvpn/network-manager-openvpn.hash
similarity index 100%
rename from software/package/network-manager-openvpn/network-manager-openvpn.hash
rename to buildroot/package/network-manager-openvpn/network-manager-openvpn.hash
diff --git a/software/package/network-manager-openvpn/network-manager-openvpn.mk b/buildroot/package/network-manager-openvpn/network-manager-openvpn.mk
similarity index 100%
rename from software/package/network-manager-openvpn/network-manager-openvpn.mk
rename to buildroot/package/network-manager-openvpn/network-manager-openvpn.mk
diff --git a/software/package/network-manager/Config.in b/buildroot/package/network-manager/Config.in
similarity index 100%
rename from software/package/network-manager/Config.in
rename to buildroot/package/network-manager/Config.in
diff --git a/software/package/network-manager/S45network-manager b/buildroot/package/network-manager/S45network-manager
similarity index 100%
rename from software/package/network-manager/S45network-manager
rename to buildroot/package/network-manager/S45network-manager
diff --git a/software/package/network-manager/network-manager.hash b/buildroot/package/network-manager/network-manager.hash
similarity index 100%
rename from software/package/network-manager/network-manager.hash
rename to buildroot/package/network-manager/network-manager.hash
diff --git a/software/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk
similarity index 100%
rename from software/package/network-manager/network-manager.mk
rename to buildroot/package/network-manager/network-manager.mk
diff --git a/software/package/newt/Config.in b/buildroot/package/newt/Config.in
similarity index 100%
rename from software/package/newt/Config.in
rename to buildroot/package/newt/Config.in
diff --git a/software/package/newt/newt.hash b/buildroot/package/newt/newt.hash
similarity index 100%
rename from software/package/newt/newt.hash
rename to buildroot/package/newt/newt.hash
diff --git a/software/package/newt/newt.mk b/buildroot/package/newt/newt.mk
similarity index 100%
rename from software/package/newt/newt.mk
rename to buildroot/package/newt/newt.mk
diff --git a/software/package/nfacct/Config.in b/buildroot/package/nfacct/Config.in
similarity index 100%
rename from software/package/nfacct/Config.in
rename to buildroot/package/nfacct/Config.in
diff --git a/software/package/nfacct/nfacct.hash b/buildroot/package/nfacct/nfacct.hash
similarity index 100%
rename from software/package/nfacct/nfacct.hash
rename to buildroot/package/nfacct/nfacct.hash
diff --git a/software/package/nfacct/nfacct.mk b/buildroot/package/nfacct/nfacct.mk
similarity index 100%
rename from software/package/nfacct/nfacct.mk
rename to buildroot/package/nfacct/nfacct.mk
diff --git a/software/package/nfs-utils/Config.in b/buildroot/package/nfs-utils/Config.in
similarity index 100%
rename from software/package/nfs-utils/Config.in
rename to buildroot/package/nfs-utils/Config.in
diff --git a/software/package/nfs-utils/S60nfs b/buildroot/package/nfs-utils/S60nfs
similarity index 100%
rename from software/package/nfs-utils/S60nfs
rename to buildroot/package/nfs-utils/S60nfs
diff --git a/software/package/nfs-utils/nfs-utils.hash b/buildroot/package/nfs-utils/nfs-utils.hash
similarity index 100%
rename from software/package/nfs-utils/nfs-utils.hash
rename to buildroot/package/nfs-utils/nfs-utils.hash
diff --git a/software/package/nfs-utils/nfs-utils.mk b/buildroot/package/nfs-utils/nfs-utils.mk
similarity index 100%
rename from software/package/nfs-utils/nfs-utils.mk
rename to buildroot/package/nfs-utils/nfs-utils.mk
diff --git a/software/package/nfs-utils/nfs-utils_env.sh b/buildroot/package/nfs-utils/nfs-utils_env.sh
similarity index 100%
rename from software/package/nfs-utils/nfs-utils_env.sh
rename to buildroot/package/nfs-utils/nfs-utils_env.sh
diff --git a/software/package/nfs-utils/nfs-utils_tmpfiles.conf b/buildroot/package/nfs-utils/nfs-utils_tmpfiles.conf
similarity index 100%
rename from software/package/nfs-utils/nfs-utils_tmpfiles.conf
rename to buildroot/package/nfs-utils/nfs-utils_tmpfiles.conf
diff --git a/software/package/nftables/Config.in b/buildroot/package/nftables/Config.in
similarity index 100%
rename from software/package/nftables/Config.in
rename to buildroot/package/nftables/Config.in
diff --git a/software/package/nftables/nftables.hash b/buildroot/package/nftables/nftables.hash
similarity index 100%
rename from software/package/nftables/nftables.hash
rename to buildroot/package/nftables/nftables.hash
diff --git a/software/package/nftables/nftables.mk b/buildroot/package/nftables/nftables.mk
similarity index 100%
rename from software/package/nftables/nftables.mk
rename to buildroot/package/nftables/nftables.mk
diff --git a/software/package/nghttp2/Config.in b/buildroot/package/nghttp2/Config.in
similarity index 100%
rename from software/package/nghttp2/Config.in
rename to buildroot/package/nghttp2/Config.in
diff --git a/software/package/nghttp2/nghttp2.hash b/buildroot/package/nghttp2/nghttp2.hash
similarity index 100%
rename from software/package/nghttp2/nghttp2.hash
rename to buildroot/package/nghttp2/nghttp2.hash
diff --git a/software/package/nghttp2/nghttp2.mk b/buildroot/package/nghttp2/nghttp2.mk
similarity index 100%
rename from software/package/nghttp2/nghttp2.mk
rename to buildroot/package/nghttp2/nghttp2.mk
diff --git a/software/package/nginx-dav-ext/Config.in b/buildroot/package/nginx-dav-ext/Config.in
similarity index 100%
rename from software/package/nginx-dav-ext/Config.in
rename to buildroot/package/nginx-dav-ext/Config.in
diff --git a/software/package/nginx-dav-ext/nginx-dav-ext.hash b/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash
similarity index 100%
rename from software/package/nginx-dav-ext/nginx-dav-ext.hash
rename to buildroot/package/nginx-dav-ext/nginx-dav-ext.hash
diff --git a/software/package/nginx-dav-ext/nginx-dav-ext.mk b/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk
similarity index 100%
rename from software/package/nginx-dav-ext/nginx-dav-ext.mk
rename to buildroot/package/nginx-dav-ext/nginx-dav-ext.mk
diff --git a/software/package/nginx-modsecurity/Config.in b/buildroot/package/nginx-modsecurity/Config.in
similarity index 100%
rename from software/package/nginx-modsecurity/Config.in
rename to buildroot/package/nginx-modsecurity/Config.in
diff --git a/software/package/nginx-modsecurity/nginx-modsecurity.hash b/buildroot/package/nginx-modsecurity/nginx-modsecurity.hash
similarity index 100%
rename from software/package/nginx-modsecurity/nginx-modsecurity.hash
rename to buildroot/package/nginx-modsecurity/nginx-modsecurity.hash
diff --git a/software/package/nginx-modsecurity/nginx-modsecurity.mk b/buildroot/package/nginx-modsecurity/nginx-modsecurity.mk
similarity index 100%
rename from software/package/nginx-modsecurity/nginx-modsecurity.mk
rename to buildroot/package/nginx-modsecurity/nginx-modsecurity.mk
diff --git a/software/package/nginx-naxsi/Config.in b/buildroot/package/nginx-naxsi/Config.in
similarity index 100%
rename from software/package/nginx-naxsi/Config.in
rename to buildroot/package/nginx-naxsi/Config.in
diff --git a/software/package/nginx-naxsi/nginx-naxsi.hash b/buildroot/package/nginx-naxsi/nginx-naxsi.hash
similarity index 100%
rename from software/package/nginx-naxsi/nginx-naxsi.hash
rename to buildroot/package/nginx-naxsi/nginx-naxsi.hash
diff --git a/software/package/nginx-naxsi/nginx-naxsi.mk b/buildroot/package/nginx-naxsi/nginx-naxsi.mk
similarity index 100%
rename from software/package/nginx-naxsi/nginx-naxsi.mk
rename to buildroot/package/nginx-naxsi/nginx-naxsi.mk
diff --git a/software/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch b/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch
similarity index 100%
rename from software/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch
rename to buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch
diff --git a/software/package/nginx-upload/Config.in b/buildroot/package/nginx-upload/Config.in
similarity index 100%
rename from software/package/nginx-upload/Config.in
rename to buildroot/package/nginx-upload/Config.in
diff --git a/software/package/nginx-upload/nginx-upload.hash b/buildroot/package/nginx-upload/nginx-upload.hash
similarity index 100%
rename from software/package/nginx-upload/nginx-upload.hash
rename to buildroot/package/nginx-upload/nginx-upload.hash
diff --git a/software/package/nginx-upload/nginx-upload.mk b/buildroot/package/nginx-upload/nginx-upload.mk
similarity index 100%
rename from software/package/nginx-upload/nginx-upload.mk
rename to buildroot/package/nginx-upload/nginx-upload.mk
diff --git a/software/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
similarity index 100%
rename from software/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
rename to buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
diff --git a/software/package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch b/buildroot/package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
similarity index 100%
rename from software/package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
rename to buildroot/package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
diff --git a/software/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
similarity index 100%
rename from software/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
rename to buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
diff --git a/software/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
similarity index 100%
rename from software/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
rename to buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
diff --git a/software/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
similarity index 100%
rename from software/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
rename to buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
diff --git a/software/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
similarity index 100%
rename from software/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
rename to buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
diff --git a/software/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch
similarity index 100%
rename from software/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch
rename to buildroot/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch
diff --git a/software/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/buildroot/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
similarity index 100%
rename from software/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
rename to buildroot/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
diff --git a/software/package/nginx/Config.in b/buildroot/package/nginx/Config.in
similarity index 100%
rename from software/package/nginx/Config.in
rename to buildroot/package/nginx/Config.in
diff --git a/software/package/nginx/S50nginx b/buildroot/package/nginx/S50nginx
similarity index 100%
rename from software/package/nginx/S50nginx
rename to buildroot/package/nginx/S50nginx
diff --git a/software/package/nginx/nginx.hash b/buildroot/package/nginx/nginx.hash
similarity index 100%
rename from software/package/nginx/nginx.hash
rename to buildroot/package/nginx/nginx.hash
diff --git a/software/package/nginx/nginx.logrotate b/buildroot/package/nginx/nginx.logrotate
similarity index 100%
rename from software/package/nginx/nginx.logrotate
rename to buildroot/package/nginx/nginx.logrotate
diff --git a/software/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk
similarity index 100%
rename from software/package/nginx/nginx.mk
rename to buildroot/package/nginx/nginx.mk
diff --git a/software/package/nginx/nginx.service b/buildroot/package/nginx/nginx.service
similarity index 100%
rename from software/package/nginx/nginx.service
rename to buildroot/package/nginx/nginx.service
diff --git a/software/package/ngircd/Config.in b/buildroot/package/ngircd/Config.in
similarity index 100%
rename from software/package/ngircd/Config.in
rename to buildroot/package/ngircd/Config.in
diff --git a/software/package/ngircd/ngircd.hash b/buildroot/package/ngircd/ngircd.hash
similarity index 100%
rename from software/package/ngircd/ngircd.hash
rename to buildroot/package/ngircd/ngircd.hash
diff --git a/software/package/ngircd/ngircd.mk b/buildroot/package/ngircd/ngircd.mk
similarity index 100%
rename from software/package/ngircd/ngircd.mk
rename to buildroot/package/ngircd/ngircd.mk
diff --git a/software/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/buildroot/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch
similarity index 100%
rename from software/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch
rename to buildroot/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch
diff --git a/software/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/buildroot/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch
similarity index 100%
rename from software/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch
rename to buildroot/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch
diff --git a/software/package/ngrep/0003-fix-disable-tcpkill.patch b/buildroot/package/ngrep/0003-fix-disable-tcpkill.patch
similarity index 100%
rename from software/package/ngrep/0003-fix-disable-tcpkill.patch
rename to buildroot/package/ngrep/0003-fix-disable-tcpkill.patch
diff --git a/software/package/ngrep/Config.in b/buildroot/package/ngrep/Config.in
similarity index 100%
rename from software/package/ngrep/Config.in
rename to buildroot/package/ngrep/Config.in
diff --git a/software/package/ngrep/ngrep.hash b/buildroot/package/ngrep/ngrep.hash
similarity index 100%
rename from software/package/ngrep/ngrep.hash
rename to buildroot/package/ngrep/ngrep.hash
diff --git a/software/package/ngrep/ngrep.mk b/buildroot/package/ngrep/ngrep.mk
similarity index 100%
rename from software/package/ngrep/ngrep.mk
rename to buildroot/package/ngrep/ngrep.mk
diff --git a/software/package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch b/buildroot/package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch
similarity index 100%
rename from software/package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch
rename to buildroot/package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch
diff --git a/software/package/nilfs-utils/Config.in b/buildroot/package/nilfs-utils/Config.in
similarity index 100%
rename from software/package/nilfs-utils/Config.in
rename to buildroot/package/nilfs-utils/Config.in
diff --git a/software/package/nilfs-utils/nilfs-utils.hash b/buildroot/package/nilfs-utils/nilfs-utils.hash
similarity index 100%
rename from software/package/nilfs-utils/nilfs-utils.hash
rename to buildroot/package/nilfs-utils/nilfs-utils.hash
diff --git a/software/package/nilfs-utils/nilfs-utils.mk b/buildroot/package/nilfs-utils/nilfs-utils.mk
similarity index 100%
rename from software/package/nilfs-utils/nilfs-utils.mk
rename to buildroot/package/nilfs-utils/nilfs-utils.mk
diff --git a/software/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch b/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch
similarity index 100%
rename from software/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch
rename to buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch
diff --git a/software/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch b/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch
similarity index 100%
rename from software/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch
rename to buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch
diff --git a/software/package/ninja/0003-CMake-fix-object-library-usage.patch b/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch
similarity index 100%
rename from software/package/ninja/0003-CMake-fix-object-library-usage.patch
rename to buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch
diff --git a/software/package/ninja/ninja.hash b/buildroot/package/ninja/ninja.hash
similarity index 100%
rename from software/package/ninja/ninja.hash
rename to buildroot/package/ninja/ninja.hash
diff --git a/software/package/ninja/ninja.mk b/buildroot/package/ninja/ninja.mk
similarity index 100%
rename from software/package/ninja/ninja.mk
rename to buildroot/package/ninja/ninja.mk
diff --git a/software/package/nload/Config.in b/buildroot/package/nload/Config.in
similarity index 100%
rename from software/package/nload/Config.in
rename to buildroot/package/nload/Config.in
diff --git a/software/package/nload/nload.hash b/buildroot/package/nload/nload.hash
similarity index 100%
rename from software/package/nload/nload.hash
rename to buildroot/package/nload/nload.hash
diff --git a/software/package/nload/nload.mk b/buildroot/package/nload/nload.mk
similarity index 100%
rename from software/package/nload/nload.mk
rename to buildroot/package/nload/nload.mk
diff --git a/software/package/nmap/0001-libdnet-wrapper-configure.patch b/buildroot/package/nmap/0001-libdnet-wrapper-configure.patch
similarity index 100%
rename from software/package/nmap/0001-libdnet-wrapper-configure.patch
rename to buildroot/package/nmap/0001-libdnet-wrapper-configure.patch
diff --git a/software/package/nmap/Config.in b/buildroot/package/nmap/Config.in
similarity index 100%
rename from software/package/nmap/Config.in
rename to buildroot/package/nmap/Config.in
diff --git a/software/package/nmap/nmap.hash b/buildroot/package/nmap/nmap.hash
similarity index 100%
rename from software/package/nmap/nmap.hash
rename to buildroot/package/nmap/nmap.hash
diff --git a/software/package/nmap/nmap.mk b/buildroot/package/nmap/nmap.mk
similarity index 100%
rename from software/package/nmap/nmap.mk
rename to buildroot/package/nmap/nmap.mk
diff --git a/software/package/nmon/Config.in b/buildroot/package/nmon/Config.in
similarity index 100%
rename from software/package/nmon/Config.in
rename to buildroot/package/nmon/Config.in
diff --git a/software/package/nmon/nmon.hash b/buildroot/package/nmon/nmon.hash
similarity index 100%
rename from software/package/nmon/nmon.hash
rename to buildroot/package/nmon/nmon.hash
diff --git a/software/package/nmon/nmon.mk b/buildroot/package/nmon/nmon.mk
similarity index 100%
rename from software/package/nmon/nmon.mk
rename to buildroot/package/nmon/nmon.mk
diff --git a/software/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch b/buildroot/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch
similarity index 100%
rename from software/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch
rename to buildroot/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch
diff --git a/software/package/nodejs/Config.in b/buildroot/package/nodejs/Config.in
similarity index 100%
rename from software/package/nodejs/Config.in
rename to buildroot/package/nodejs/Config.in
diff --git a/software/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash
similarity index 100%
rename from software/package/nodejs/nodejs.hash
rename to buildroot/package/nodejs/nodejs.hash
diff --git a/software/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk
similarity index 100%
rename from software/package/nodejs/nodejs.mk
rename to buildroot/package/nodejs/nodejs.mk
diff --git a/software/package/nodm/Config.in b/buildroot/package/nodm/Config.in
similarity index 100%
rename from software/package/nodm/Config.in
rename to buildroot/package/nodm/Config.in
diff --git a/software/package/nodm/S90nodm b/buildroot/package/nodm/S90nodm
similarity index 100%
rename from software/package/nodm/S90nodm
rename to buildroot/package/nodm/S90nodm
diff --git a/software/package/nodm/nodm.hash b/buildroot/package/nodm/nodm.hash
similarity index 100%
rename from software/package/nodm/nodm.hash
rename to buildroot/package/nodm/nodm.hash
diff --git a/software/package/nodm/nodm.mk b/buildroot/package/nodm/nodm.mk
similarity index 100%
rename from software/package/nodm/nodm.mk
rename to buildroot/package/nodm/nodm.mk
diff --git a/software/package/nodm/nodm.pam b/buildroot/package/nodm/nodm.pam
similarity index 100%
rename from software/package/nodm/nodm.pam
rename to buildroot/package/nodm/nodm.pam
diff --git a/software/package/noip/Config.in b/buildroot/package/noip/Config.in
similarity index 100%
rename from software/package/noip/Config.in
rename to buildroot/package/noip/Config.in
diff --git a/software/package/noip/noip.hash b/buildroot/package/noip/noip.hash
similarity index 100%
rename from software/package/noip/noip.hash
rename to buildroot/package/noip/noip.hash
diff --git a/software/package/noip/noip.mk b/buildroot/package/noip/noip.mk
similarity index 100%
rename from software/package/noip/noip.mk
rename to buildroot/package/noip/noip.mk
diff --git a/software/package/norm/0001-protolib-drop-linux-version-check.patch b/buildroot/package/norm/0001-protolib-drop-linux-version-check.patch
similarity index 100%
rename from software/package/norm/0001-protolib-drop-linux-version-check.patch
rename to buildroot/package/norm/0001-protolib-drop-linux-version-check.patch
diff --git a/software/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch b/buildroot/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
similarity index 100%
rename from software/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
rename to buildroot/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
diff --git a/software/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch b/buildroot/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch
similarity index 100%
rename from software/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch
rename to buildroot/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch
diff --git a/software/package/norm/Config.in b/buildroot/package/norm/Config.in
similarity index 100%
rename from software/package/norm/Config.in
rename to buildroot/package/norm/Config.in
diff --git a/software/package/norm/norm.hash b/buildroot/package/norm/norm.hash
similarity index 100%
rename from software/package/norm/norm.hash
rename to buildroot/package/norm/norm.hash
diff --git a/software/package/norm/norm.mk b/buildroot/package/norm/norm.mk
similarity index 100%
rename from software/package/norm/norm.mk
rename to buildroot/package/norm/norm.mk
diff --git a/software/package/nss-mdns/Config.in b/buildroot/package/nss-mdns/Config.in
similarity index 100%
rename from software/package/nss-mdns/Config.in
rename to buildroot/package/nss-mdns/Config.in
diff --git a/software/package/nss-mdns/nss-mdns.hash b/buildroot/package/nss-mdns/nss-mdns.hash
similarity index 100%
rename from software/package/nss-mdns/nss-mdns.hash
rename to buildroot/package/nss-mdns/nss-mdns.hash
diff --git a/software/package/nss-mdns/nss-mdns.mk b/buildroot/package/nss-mdns/nss-mdns.mk
similarity index 100%
rename from software/package/nss-mdns/nss-mdns.mk
rename to buildroot/package/nss-mdns/nss-mdns.mk
diff --git a/software/package/nss-myhostname/Config.in b/buildroot/package/nss-myhostname/Config.in
similarity index 100%
rename from software/package/nss-myhostname/Config.in
rename to buildroot/package/nss-myhostname/Config.in
diff --git a/software/package/nss-myhostname/nss-myhostname.hash b/buildroot/package/nss-myhostname/nss-myhostname.hash
similarity index 100%
rename from software/package/nss-myhostname/nss-myhostname.hash
rename to buildroot/package/nss-myhostname/nss-myhostname.hash
diff --git a/software/package/nss-myhostname/nss-myhostname.mk b/buildroot/package/nss-myhostname/nss-myhostname.mk
similarity index 100%
rename from software/package/nss-myhostname/nss-myhostname.mk
rename to buildroot/package/nss-myhostname/nss-myhostname.mk
diff --git a/software/package/nss-pam-ldapd/Config.in b/buildroot/package/nss-pam-ldapd/Config.in
similarity index 100%
rename from software/package/nss-pam-ldapd/Config.in
rename to buildroot/package/nss-pam-ldapd/Config.in
diff --git a/software/package/nss-pam-ldapd/S45nslcd b/buildroot/package/nss-pam-ldapd/S45nslcd
similarity index 100%
rename from software/package/nss-pam-ldapd/S45nslcd
rename to buildroot/package/nss-pam-ldapd/S45nslcd
diff --git a/software/package/nss-pam-ldapd/nslcd.service b/buildroot/package/nss-pam-ldapd/nslcd.service
similarity index 100%
rename from software/package/nss-pam-ldapd/nslcd.service
rename to buildroot/package/nss-pam-ldapd/nslcd.service
diff --git a/software/package/nss-pam-ldapd/nss-pam-ldapd.hash b/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash
similarity index 100%
rename from software/package/nss-pam-ldapd/nss-pam-ldapd.hash
rename to buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash
diff --git a/software/package/nss-pam-ldapd/nss-pam-ldapd.mk b/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk
similarity index 100%
rename from software/package/nss-pam-ldapd/nss-pam-ldapd.mk
rename to buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk
diff --git a/software/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch b/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch
similarity index 100%
rename from software/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch
rename to buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch
diff --git a/software/package/ntfs-3g/Config.in b/buildroot/package/ntfs-3g/Config.in
similarity index 100%
rename from software/package/ntfs-3g/Config.in
rename to buildroot/package/ntfs-3g/Config.in
diff --git a/software/package/ntfs-3g/ntfs-3g.hash b/buildroot/package/ntfs-3g/ntfs-3g.hash
similarity index 100%
rename from software/package/ntfs-3g/ntfs-3g.hash
rename to buildroot/package/ntfs-3g/ntfs-3g.hash
diff --git a/software/package/ntfs-3g/ntfs-3g.mk b/buildroot/package/ntfs-3g/ntfs-3g.mk
similarity index 100%
rename from software/package/ntfs-3g/ntfs-3g.mk
rename to buildroot/package/ntfs-3g/ntfs-3g.mk
diff --git a/software/package/ntp/0001-nano.patch b/buildroot/package/ntp/0001-nano.patch
similarity index 100%
rename from software/package/ntp/0001-nano.patch
rename to buildroot/package/ntp/0001-nano.patch
diff --git a/software/package/ntp/0002-ntp-syscalls-fallback.patch b/buildroot/package/ntp/0002-ntp-syscalls-fallback.patch
similarity index 100%
rename from software/package/ntp/0002-ntp-syscalls-fallback.patch
rename to buildroot/package/ntp/0002-ntp-syscalls-fallback.patch
diff --git a/software/package/ntp/0003-override-shell.patch b/buildroot/package/ntp/0003-override-shell.patch
similarity index 100%
rename from software/package/ntp/0003-override-shell.patch
rename to buildroot/package/ntp/0003-override-shell.patch
diff --git a/software/package/ntp/Config.in b/buildroot/package/ntp/Config.in
similarity index 100%
rename from software/package/ntp/Config.in
rename to buildroot/package/ntp/Config.in
diff --git a/software/package/ntp/S48sntp b/buildroot/package/ntp/S48sntp
similarity index 100%
rename from software/package/ntp/S48sntp
rename to buildroot/package/ntp/S48sntp
diff --git a/software/package/ntp/S49ntp b/buildroot/package/ntp/S49ntp
similarity index 100%
rename from software/package/ntp/S49ntp
rename to buildroot/package/ntp/S49ntp
diff --git a/software/package/ntp/ntp.hash b/buildroot/package/ntp/ntp.hash
similarity index 100%
rename from software/package/ntp/ntp.hash
rename to buildroot/package/ntp/ntp.hash
diff --git a/software/package/ntp/ntp.mk b/buildroot/package/ntp/ntp.mk
similarity index 100%
rename from software/package/ntp/ntp.mk
rename to buildroot/package/ntp/ntp.mk
diff --git a/software/package/ntp/ntpd.etc.conf b/buildroot/package/ntp/ntpd.etc.conf
similarity index 100%
rename from software/package/ntp/ntpd.etc.conf
rename to buildroot/package/ntp/ntpd.etc.conf
diff --git a/software/package/ntp/ntpd.service b/buildroot/package/ntp/ntpd.service
similarity index 100%
rename from software/package/ntp/ntpd.service
rename to buildroot/package/ntp/ntpd.service
diff --git a/software/package/numactl/Config.in b/buildroot/package/numactl/Config.in
similarity index 100%
rename from software/package/numactl/Config.in
rename to buildroot/package/numactl/Config.in
diff --git a/software/package/numactl/numactl.hash b/buildroot/package/numactl/numactl.hash
similarity index 100%
rename from software/package/numactl/numactl.hash
rename to buildroot/package/numactl/numactl.hash
diff --git a/software/package/numactl/numactl.mk b/buildroot/package/numactl/numactl.mk
similarity index 100%
rename from software/package/numactl/numactl.mk
rename to buildroot/package/numactl/numactl.mk
diff --git a/software/package/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch b/buildroot/package/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch
similarity index 100%
rename from software/package/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch
rename to buildroot/package/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch
diff --git a/software/package/nut/0002-client-ups-add-missing-include.patch b/buildroot/package/nut/0002-client-ups-add-missing-include.patch
similarity index 100%
rename from software/package/nut/0002-client-ups-add-missing-include.patch
rename to buildroot/package/nut/0002-client-ups-add-missing-include.patch
diff --git a/software/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch b/buildroot/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch
similarity index 100%
rename from software/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch
rename to buildroot/package/nut/0003-Add-compatibility-with-openssl-1.1.0.patch
diff --git a/software/package/nut/Config.in b/buildroot/package/nut/Config.in
similarity index 100%
rename from software/package/nut/Config.in
rename to buildroot/package/nut/Config.in
diff --git a/software/package/nut/nut.hash b/buildroot/package/nut/nut.hash
similarity index 100%
rename from software/package/nut/nut.hash
rename to buildroot/package/nut/nut.hash
diff --git a/software/package/nut/nut.mk b/buildroot/package/nut/nut.mk
similarity index 100%
rename from software/package/nut/nut.mk
rename to buildroot/package/nut/nut.mk
diff --git a/software/package/nuttcp/0001-susv3-legacy.patch b/buildroot/package/nuttcp/0001-susv3-legacy.patch
similarity index 100%
rename from software/package/nuttcp/0001-susv3-legacy.patch
rename to buildroot/package/nuttcp/0001-susv3-legacy.patch
diff --git a/software/package/nuttcp/Config.in b/buildroot/package/nuttcp/Config.in
similarity index 100%
rename from software/package/nuttcp/Config.in
rename to buildroot/package/nuttcp/Config.in
diff --git a/software/package/nuttcp/nuttcp.hash b/buildroot/package/nuttcp/nuttcp.hash
similarity index 100%
rename from software/package/nuttcp/nuttcp.hash
rename to buildroot/package/nuttcp/nuttcp.hash
diff --git a/software/package/nuttcp/nuttcp.mk b/buildroot/package/nuttcp/nuttcp.mk
similarity index 100%
rename from software/package/nuttcp/nuttcp.mk
rename to buildroot/package/nuttcp/nuttcp.mk
diff --git a/software/package/nvidia-driver/0001-use-LDFLAGS.patch b/buildroot/package/nvidia-driver/0001-use-LDFLAGS.patch
similarity index 100%
rename from software/package/nvidia-driver/0001-use-LDFLAGS.patch
rename to buildroot/package/nvidia-driver/0001-use-LDFLAGS.patch
diff --git a/software/package/nvidia-driver/Config.in b/buildroot/package/nvidia-driver/Config.in
similarity index 100%
rename from software/package/nvidia-driver/Config.in
rename to buildroot/package/nvidia-driver/Config.in
diff --git a/software/package/nvidia-driver/egl.pc b/buildroot/package/nvidia-driver/egl.pc
similarity index 100%
rename from software/package/nvidia-driver/egl.pc
rename to buildroot/package/nvidia-driver/egl.pc
diff --git a/software/package/nvidia-driver/gl.pc b/buildroot/package/nvidia-driver/gl.pc
similarity index 100%
rename from software/package/nvidia-driver/gl.pc
rename to buildroot/package/nvidia-driver/gl.pc
diff --git a/software/package/nvidia-driver/nvidia-driver.hash b/buildroot/package/nvidia-driver/nvidia-driver.hash
similarity index 100%
rename from software/package/nvidia-driver/nvidia-driver.hash
rename to buildroot/package/nvidia-driver/nvidia-driver.hash
diff --git a/software/package/nvidia-driver/nvidia-driver.mk b/buildroot/package/nvidia-driver/nvidia-driver.mk
similarity index 100%
rename from software/package/nvidia-driver/nvidia-driver.mk
rename to buildroot/package/nvidia-driver/nvidia-driver.mk
diff --git a/software/package/nvidia-tegra23/Config.in b/buildroot/package/nvidia-tegra23/Config.in
similarity index 100%
rename from software/package/nvidia-tegra23/Config.in
rename to buildroot/package/nvidia-tegra23/Config.in
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in b/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash b/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk
diff --git a/software/package/nvidia-tegra23/nvidia-tegra23.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23.mk
similarity index 100%
rename from software/package/nvidia-tegra23/nvidia-tegra23.mk
rename to buildroot/package/nvidia-tegra23/nvidia-tegra23.mk
diff --git a/software/package/nvme/Config.in b/buildroot/package/nvme/Config.in
similarity index 100%
rename from software/package/nvme/Config.in
rename to buildroot/package/nvme/Config.in
diff --git a/software/package/nvme/nvme.hash b/buildroot/package/nvme/nvme.hash
similarity index 100%
rename from software/package/nvme/nvme.hash
rename to buildroot/package/nvme/nvme.hash
diff --git a/software/package/nvme/nvme.mk b/buildroot/package/nvme/nvme.mk
similarity index 100%
rename from software/package/nvme/nvme.mk
rename to buildroot/package/nvme/nvme.mk
diff --git a/software/package/obsidian-cursors/Config.in b/buildroot/package/obsidian-cursors/Config.in
similarity index 100%
rename from software/package/obsidian-cursors/Config.in
rename to buildroot/package/obsidian-cursors/Config.in
diff --git a/software/package/obsidian-cursors/obsidian-cursors.hash b/buildroot/package/obsidian-cursors/obsidian-cursors.hash
similarity index 100%
rename from software/package/obsidian-cursors/obsidian-cursors.hash
rename to buildroot/package/obsidian-cursors/obsidian-cursors.hash
diff --git a/software/package/obsidian-cursors/obsidian-cursors.mk b/buildroot/package/obsidian-cursors/obsidian-cursors.mk
similarity index 100%
rename from software/package/obsidian-cursors/obsidian-cursors.mk
rename to buildroot/package/obsidian-cursors/obsidian-cursors.mk
diff --git a/software/package/ocf-linux/ocf-linux.hash b/buildroot/package/ocf-linux/ocf-linux.hash
similarity index 100%
rename from software/package/ocf-linux/ocf-linux.hash
rename to buildroot/package/ocf-linux/ocf-linux.hash
diff --git a/software/package/ocf-linux/ocf-linux.mk b/buildroot/package/ocf-linux/ocf-linux.mk
similarity index 100%
rename from software/package/ocf-linux/ocf-linux.mk
rename to buildroot/package/ocf-linux/ocf-linux.mk
diff --git a/software/package/ocrad/Config.in b/buildroot/package/ocrad/Config.in
similarity index 100%
rename from software/package/ocrad/Config.in
rename to buildroot/package/ocrad/Config.in
diff --git a/software/package/ocrad/ocrad.hash b/buildroot/package/ocrad/ocrad.hash
similarity index 100%
rename from software/package/ocrad/ocrad.hash
rename to buildroot/package/ocrad/ocrad.hash
diff --git a/software/package/ocrad/ocrad.mk b/buildroot/package/ocrad/ocrad.mk
similarity index 100%
rename from software/package/ocrad/ocrad.mk
rename to buildroot/package/ocrad/ocrad.mk
diff --git a/software/package/odhcp6c/Config.in b/buildroot/package/odhcp6c/Config.in
similarity index 100%
rename from software/package/odhcp6c/Config.in
rename to buildroot/package/odhcp6c/Config.in
diff --git a/software/package/odhcp6c/odhcp6c.hash b/buildroot/package/odhcp6c/odhcp6c.hash
similarity index 100%
rename from software/package/odhcp6c/odhcp6c.hash
rename to buildroot/package/odhcp6c/odhcp6c.hash
diff --git a/software/package/odhcp6c/odhcp6c.mk b/buildroot/package/odhcp6c/odhcp6c.mk
similarity index 100%
rename from software/package/odhcp6c/odhcp6c.mk
rename to buildroot/package/odhcp6c/odhcp6c.mk
diff --git a/software/package/odhcploc/Config.in b/buildroot/package/odhcploc/Config.in
similarity index 100%
rename from software/package/odhcploc/Config.in
rename to buildroot/package/odhcploc/Config.in
diff --git a/software/package/odhcploc/odhcploc.hash b/buildroot/package/odhcploc/odhcploc.hash
similarity index 100%
rename from software/package/odhcploc/odhcploc.hash
rename to buildroot/package/odhcploc/odhcploc.hash
diff --git a/software/package/odhcploc/odhcploc.mk b/buildroot/package/odhcploc/odhcploc.mk
similarity index 100%
rename from software/package/odhcploc/odhcploc.mk
rename to buildroot/package/odhcploc/odhcploc.mk
diff --git a/software/package/ofono/0001-uclibc-backtrace.patch b/buildroot/package/ofono/0001-uclibc-backtrace.patch
similarity index 100%
rename from software/package/ofono/0001-uclibc-backtrace.patch
rename to buildroot/package/ofono/0001-uclibc-backtrace.patch
diff --git a/software/package/ofono/0002-fix-musl-compile.patch b/buildroot/package/ofono/0002-fix-musl-compile.patch
similarity index 100%
rename from software/package/ofono/0002-fix-musl-compile.patch
rename to buildroot/package/ofono/0002-fix-musl-compile.patch
diff --git a/software/package/ofono/Config.in b/buildroot/package/ofono/Config.in
similarity index 100%
rename from software/package/ofono/Config.in
rename to buildroot/package/ofono/Config.in
diff --git a/software/package/ofono/S46ofono b/buildroot/package/ofono/S46ofono
similarity index 100%
rename from software/package/ofono/S46ofono
rename to buildroot/package/ofono/S46ofono
diff --git a/software/package/ofono/ofono.hash b/buildroot/package/ofono/ofono.hash
similarity index 100%
rename from software/package/ofono/ofono.hash
rename to buildroot/package/ofono/ofono.hash
diff --git a/software/package/ofono/ofono.mk b/buildroot/package/ofono/ofono.mk
similarity index 100%
rename from software/package/ofono/ofono.mk
rename to buildroot/package/ofono/ofono.mk
diff --git a/software/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch b/buildroot/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch
similarity index 100%
rename from software/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch
rename to buildroot/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch
diff --git a/software/package/ogre/Config.in b/buildroot/package/ogre/Config.in
similarity index 100%
rename from software/package/ogre/Config.in
rename to buildroot/package/ogre/Config.in
diff --git a/software/package/ogre/ogre.hash b/buildroot/package/ogre/ogre.hash
similarity index 100%
rename from software/package/ogre/ogre.hash
rename to buildroot/package/ogre/ogre.hash
diff --git a/software/package/ogre/ogre.mk b/buildroot/package/ogre/ogre.mk
similarity index 100%
rename from software/package/ogre/ogre.mk
rename to buildroot/package/ogre/ogre.mk
diff --git a/software/package/olsr/Config.in b/buildroot/package/olsr/Config.in
similarity index 100%
rename from software/package/olsr/Config.in
rename to buildroot/package/olsr/Config.in
diff --git a/software/package/olsr/S50olsr b/buildroot/package/olsr/S50olsr
similarity index 100%
rename from software/package/olsr/S50olsr
rename to buildroot/package/olsr/S50olsr
diff --git a/software/package/olsr/olsr.hash b/buildroot/package/olsr/olsr.hash
similarity index 100%
rename from software/package/olsr/olsr.hash
rename to buildroot/package/olsr/olsr.hash
diff --git a/software/package/olsr/olsr.mk b/buildroot/package/olsr/olsr.mk
similarity index 100%
rename from software/package/olsr/olsr.mk
rename to buildroot/package/olsr/olsr.mk
diff --git a/software/package/olsr/olsr.service b/buildroot/package/olsr/olsr.service
similarity index 100%
rename from software/package/olsr/olsr.service
rename to buildroot/package/olsr/olsr.service
diff --git a/software/package/omap-u-boot-utils/Config.in.host b/buildroot/package/omap-u-boot-utils/Config.in.host
similarity index 100%
rename from software/package/omap-u-boot-utils/Config.in.host
rename to buildroot/package/omap-u-boot-utils/Config.in.host
diff --git a/software/package/omap-u-boot-utils/omap-u-boot-utils.hash b/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.hash
similarity index 100%
rename from software/package/omap-u-boot-utils/omap-u-boot-utils.hash
rename to buildroot/package/omap-u-boot-utils/omap-u-boot-utils.hash
diff --git a/software/package/omap-u-boot-utils/omap-u-boot-utils.mk b/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.mk
similarity index 100%
rename from software/package/omap-u-boot-utils/omap-u-boot-utils.mk
rename to buildroot/package/omap-u-boot-utils/omap-u-boot-utils.mk
diff --git a/software/package/omniorb/Config.in b/buildroot/package/omniorb/Config.in
similarity index 100%
rename from software/package/omniorb/Config.in
rename to buildroot/package/omniorb/Config.in
diff --git a/software/package/omniorb/omniorb.hash b/buildroot/package/omniorb/omniorb.hash
similarity index 100%
rename from software/package/omniorb/omniorb.hash
rename to buildroot/package/omniorb/omniorb.hash
diff --git a/software/package/omniorb/omniorb.mk b/buildroot/package/omniorb/omniorb.mk
similarity index 100%
rename from software/package/omniorb/omniorb.mk
rename to buildroot/package/omniorb/omniorb.mk
diff --git a/software/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch b/buildroot/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch
similarity index 100%
rename from software/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch
rename to buildroot/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch
diff --git a/software/package/omxplayer/Config.in b/buildroot/package/omxplayer/Config.in
similarity index 100%
rename from software/package/omxplayer/Config.in
rename to buildroot/package/omxplayer/Config.in
diff --git a/software/package/omxplayer/omxplayer.hash b/buildroot/package/omxplayer/omxplayer.hash
similarity index 100%
rename from software/package/omxplayer/omxplayer.hash
rename to buildroot/package/omxplayer/omxplayer.hash
diff --git a/software/package/omxplayer/omxplayer.mk b/buildroot/package/omxplayer/omxplayer.mk
similarity index 100%
rename from software/package/omxplayer/omxplayer.mk
rename to buildroot/package/omxplayer/omxplayer.mk
diff --git a/software/package/on2-8170-libs/Config.in b/buildroot/package/on2-8170-libs/Config.in
similarity index 100%
rename from software/package/on2-8170-libs/Config.in
rename to buildroot/package/on2-8170-libs/Config.in
diff --git a/software/package/on2-8170-libs/on2-8170-libs.hash b/buildroot/package/on2-8170-libs/on2-8170-libs.hash
similarity index 100%
rename from software/package/on2-8170-libs/on2-8170-libs.hash
rename to buildroot/package/on2-8170-libs/on2-8170-libs.hash
diff --git a/software/package/on2-8170-libs/on2-8170-libs.mk b/buildroot/package/on2-8170-libs/on2-8170-libs.mk
similarity index 100%
rename from software/package/on2-8170-libs/on2-8170-libs.mk
rename to buildroot/package/on2-8170-libs/on2-8170-libs.mk
diff --git a/software/package/on2-8170-modules/Config.in b/buildroot/package/on2-8170-modules/Config.in
similarity index 100%
rename from software/package/on2-8170-modules/Config.in
rename to buildroot/package/on2-8170-modules/Config.in
diff --git a/software/package/on2-8170-modules/on2-8170-modules.hash b/buildroot/package/on2-8170-modules/on2-8170-modules.hash
similarity index 100%
rename from software/package/on2-8170-modules/on2-8170-modules.hash
rename to buildroot/package/on2-8170-modules/on2-8170-modules.hash
diff --git a/software/package/on2-8170-modules/on2-8170-modules.mk b/buildroot/package/on2-8170-modules/on2-8170-modules.mk
similarity index 100%
rename from software/package/on2-8170-modules/on2-8170-modules.mk
rename to buildroot/package/on2-8170-modules/on2-8170-modules.mk
diff --git a/software/package/oniguruma/Config.in b/buildroot/package/oniguruma/Config.in
similarity index 100%
rename from software/package/oniguruma/Config.in
rename to buildroot/package/oniguruma/Config.in
diff --git a/software/package/oniguruma/oniguruma.hash b/buildroot/package/oniguruma/oniguruma.hash
similarity index 100%
rename from software/package/oniguruma/oniguruma.hash
rename to buildroot/package/oniguruma/oniguruma.hash
diff --git a/software/package/oniguruma/oniguruma.mk b/buildroot/package/oniguruma/oniguruma.mk
similarity index 100%
rename from software/package/oniguruma/oniguruma.mk
rename to buildroot/package/oniguruma/oniguruma.mk
diff --git a/software/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch b/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch
similarity index 100%
rename from software/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch
rename to buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch
diff --git a/software/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch b/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
similarity index 100%
rename from software/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
rename to buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
diff --git a/software/package/open-lldp/0003-Makefile.am-disable-Werror.patch b/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch
similarity index 100%
rename from software/package/open-lldp/0003-Makefile.am-disable-Werror.patch
rename to buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch
diff --git a/software/package/open-lldp/0004-fixed-unknown-type-pid_t.patch b/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch
similarity index 100%
rename from software/package/open-lldp/0004-fixed-unknown-type-pid_t.patch
rename to buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch
diff --git a/software/package/open-lldp/Config.in b/buildroot/package/open-lldp/Config.in
similarity index 100%
rename from software/package/open-lldp/Config.in
rename to buildroot/package/open-lldp/Config.in
diff --git a/software/package/open-lldp/open-lldp.hash b/buildroot/package/open-lldp/open-lldp.hash
similarity index 100%
rename from software/package/open-lldp/open-lldp.hash
rename to buildroot/package/open-lldp/open-lldp.hash
diff --git a/software/package/open-lldp/open-lldp.mk b/buildroot/package/open-lldp/open-lldp.mk
similarity index 100%
rename from software/package/open-lldp/open-lldp.mk
rename to buildroot/package/open-lldp/open-lldp.mk
diff --git a/software/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch b/buildroot/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch
similarity index 100%
rename from software/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch
rename to buildroot/package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch
diff --git a/software/package/open-plc-utils/Config.in b/buildroot/package/open-plc-utils/Config.in
similarity index 100%
rename from software/package/open-plc-utils/Config.in
rename to buildroot/package/open-plc-utils/Config.in
diff --git a/software/package/open-plc-utils/open-plc-utils.hash b/buildroot/package/open-plc-utils/open-plc-utils.hash
similarity index 100%
rename from software/package/open-plc-utils/open-plc-utils.hash
rename to buildroot/package/open-plc-utils/open-plc-utils.hash
diff --git a/software/package/open-plc-utils/open-plc-utils.mk b/buildroot/package/open-plc-utils/open-plc-utils.mk
similarity index 100%
rename from software/package/open-plc-utils/open-plc-utils.mk
rename to buildroot/package/open-plc-utils/open-plc-utils.mk
diff --git a/software/package/open2300/0001-fix-makefile.patch b/buildroot/package/open2300/0001-fix-makefile.patch
similarity index 100%
rename from software/package/open2300/0001-fix-makefile.patch
rename to buildroot/package/open2300/0001-fix-makefile.patch
diff --git a/software/package/open2300/Config.in b/buildroot/package/open2300/Config.in
similarity index 100%
rename from software/package/open2300/Config.in
rename to buildroot/package/open2300/Config.in
diff --git a/software/package/open2300/open2300.hash b/buildroot/package/open2300/open2300.hash
similarity index 100%
rename from software/package/open2300/open2300.hash
rename to buildroot/package/open2300/open2300.hash
diff --git a/software/package/open2300/open2300.mk b/buildroot/package/open2300/open2300.mk
similarity index 100%
rename from software/package/open2300/open2300.mk
rename to buildroot/package/open2300/open2300.mk
diff --git a/software/package/openal/Config.in b/buildroot/package/openal/Config.in
similarity index 100%
rename from software/package/openal/Config.in
rename to buildroot/package/openal/Config.in
diff --git a/software/package/openal/openal.hash b/buildroot/package/openal/openal.hash
similarity index 100%
rename from software/package/openal/openal.hash
rename to buildroot/package/openal/openal.hash
diff --git a/software/package/openal/openal.mk b/buildroot/package/openal/openal.mk
similarity index 100%
rename from software/package/openal/openal.mk
rename to buildroot/package/openal/openal.mk
diff --git a/software/package/openblas/Config.in b/buildroot/package/openblas/Config.in
similarity index 100%
rename from software/package/openblas/Config.in
rename to buildroot/package/openblas/Config.in
diff --git a/software/package/openblas/openblas.hash b/buildroot/package/openblas/openblas.hash
similarity index 100%
rename from software/package/openblas/openblas.hash
rename to buildroot/package/openblas/openblas.hash
diff --git a/software/package/openblas/openblas.mk b/buildroot/package/openblas/openblas.mk
similarity index 100%
rename from software/package/openblas/openblas.mk
rename to buildroot/package/openblas/openblas.mk
diff --git a/software/package/openbox/Config.in b/buildroot/package/openbox/Config.in
similarity index 100%
rename from software/package/openbox/Config.in
rename to buildroot/package/openbox/Config.in
diff --git a/software/package/openbox/openbox.hash b/buildroot/package/openbox/openbox.hash
similarity index 100%
rename from software/package/openbox/openbox.hash
rename to buildroot/package/openbox/openbox.hash
diff --git a/software/package/openbox/openbox.mk b/buildroot/package/openbox/openbox.mk
similarity index 100%
rename from software/package/openbox/openbox.mk
rename to buildroot/package/openbox/openbox.mk
diff --git a/software/package/opencore-amr/Config.in b/buildroot/package/opencore-amr/Config.in
similarity index 100%
rename from software/package/opencore-amr/Config.in
rename to buildroot/package/opencore-amr/Config.in
diff --git a/software/package/opencore-amr/opencore-amr.hash b/buildroot/package/opencore-amr/opencore-amr.hash
similarity index 100%
rename from software/package/opencore-amr/opencore-amr.hash
rename to buildroot/package/opencore-amr/opencore-amr.hash
diff --git a/software/package/opencore-amr/opencore-amr.mk b/buildroot/package/opencore-amr/opencore-amr.mk
similarity index 100%
rename from software/package/opencore-amr/opencore-amr.mk
rename to buildroot/package/opencore-amr/opencore-amr.mk
diff --git a/software/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch b/buildroot/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
similarity index 100%
rename from software/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
rename to buildroot/package/opencv/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
diff --git a/software/package/opencv/0001-atomic.patch b/buildroot/package/opencv/0001-atomic.patch
similarity index 100%
rename from software/package/opencv/0001-atomic.patch
rename to buildroot/package/opencv/0001-atomic.patch
diff --git a/software/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch
similarity index 100%
rename from software/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch
rename to buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch
diff --git a/software/package/opencv/Config.in b/buildroot/package/opencv/Config.in
similarity index 100%
rename from software/package/opencv/Config.in
rename to buildroot/package/opencv/Config.in
diff --git a/software/package/opencv/opencv.hash b/buildroot/package/opencv/opencv.hash
similarity index 100%
rename from software/package/opencv/opencv.hash
rename to buildroot/package/opencv/opencv.hash
diff --git a/software/package/opencv/opencv.mk b/buildroot/package/opencv/opencv.mk
similarity index 100%
rename from software/package/opencv/opencv.mk
rename to buildroot/package/opencv/opencv.mk
diff --git a/software/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch b/buildroot/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
similarity index 100%
rename from software/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
rename to buildroot/package/opencv3/0001-Fix-build-of-grfmt_jpeg2000-cpp.patch
diff --git a/software/package/opencv3/Config.in b/buildroot/package/opencv3/Config.in
similarity index 100%
rename from software/package/opencv3/Config.in
rename to buildroot/package/opencv3/Config.in
diff --git a/software/package/opencv3/opencv3.hash b/buildroot/package/opencv3/opencv3.hash
similarity index 100%
rename from software/package/opencv3/opencv3.hash
rename to buildroot/package/opencv3/opencv3.hash
diff --git a/software/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk
similarity index 100%
rename from software/package/opencv3/opencv3.mk
rename to buildroot/package/opencv3/opencv3.mk
diff --git a/software/package/opengl/Config.in b/buildroot/package/opengl/Config.in
similarity index 100%
rename from software/package/opengl/Config.in
rename to buildroot/package/opengl/Config.in
diff --git a/software/package/opengl/libegl/Config.in b/buildroot/package/opengl/libegl/Config.in
similarity index 100%
rename from software/package/opengl/libegl/Config.in
rename to buildroot/package/opengl/libegl/Config.in
diff --git a/software/package/opengl/libegl/libegl.mk b/buildroot/package/opengl/libegl/libegl.mk
similarity index 100%
rename from software/package/opengl/libegl/libegl.mk
rename to buildroot/package/opengl/libegl/libegl.mk
diff --git a/software/package/opengl/libgl/Config.in b/buildroot/package/opengl/libgl/Config.in
similarity index 100%
rename from software/package/opengl/libgl/Config.in
rename to buildroot/package/opengl/libgl/Config.in
diff --git a/software/package/opengl/libgl/libgl.mk b/buildroot/package/opengl/libgl/libgl.mk
similarity index 100%
rename from software/package/opengl/libgl/libgl.mk
rename to buildroot/package/opengl/libgl/libgl.mk
diff --git a/software/package/opengl/libgles/Config.in b/buildroot/package/opengl/libgles/Config.in
similarity index 100%
rename from software/package/opengl/libgles/Config.in
rename to buildroot/package/opengl/libgles/Config.in
diff --git a/software/package/opengl/libgles/libgles.mk b/buildroot/package/opengl/libgles/libgles.mk
similarity index 100%
rename from software/package/opengl/libgles/libgles.mk
rename to buildroot/package/opengl/libgles/libgles.mk
diff --git a/software/package/opengl/libopencl/Config.in b/buildroot/package/opengl/libopencl/Config.in
similarity index 100%
rename from software/package/opengl/libopencl/Config.in
rename to buildroot/package/opengl/libopencl/Config.in
diff --git a/software/package/opengl/libopencl/libopencl.mk b/buildroot/package/opengl/libopencl/libopencl.mk
similarity index 100%
rename from software/package/opengl/libopencl/libopencl.mk
rename to buildroot/package/opengl/libopencl/libopencl.mk
diff --git a/software/package/opengl/libopenmax/Config.in b/buildroot/package/opengl/libopenmax/Config.in
similarity index 100%
rename from software/package/opengl/libopenmax/Config.in
rename to buildroot/package/opengl/libopenmax/Config.in
diff --git a/software/package/opengl/libopenmax/libopenmax.mk b/buildroot/package/opengl/libopenmax/libopenmax.mk
similarity index 100%
rename from software/package/opengl/libopenmax/libopenmax.mk
rename to buildroot/package/opengl/libopenmax/libopenmax.mk
diff --git a/software/package/opengl/libopenvg/Config.in b/buildroot/package/opengl/libopenvg/Config.in
similarity index 100%
rename from software/package/opengl/libopenvg/Config.in
rename to buildroot/package/opengl/libopenvg/Config.in
diff --git a/software/package/opengl/libopenvg/libopenvg.mk b/buildroot/package/opengl/libopenvg/libopenvg.mk
similarity index 100%
rename from software/package/opengl/libopenvg/libopenvg.mk
rename to buildroot/package/opengl/libopenvg/libopenvg.mk
diff --git a/software/package/opengl/opengl.mk b/buildroot/package/opengl/opengl.mk
similarity index 100%
rename from software/package/opengl/opengl.mk
rename to buildroot/package/opengl/opengl.mk
diff --git a/software/package/openipmi/0001-Avoid-searching-host-library-path.patch b/buildroot/package/openipmi/0001-Avoid-searching-host-library-path.patch
similarity index 100%
rename from software/package/openipmi/0001-Avoid-searching-host-library-path.patch
rename to buildroot/package/openipmi/0001-Avoid-searching-host-library-path.patch
diff --git a/software/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch b/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch
similarity index 100%
rename from software/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch
rename to buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch
diff --git a/software/package/openipmi/Config.in b/buildroot/package/openipmi/Config.in
similarity index 100%
rename from software/package/openipmi/Config.in
rename to buildroot/package/openipmi/Config.in
diff --git a/software/package/openipmi/openipmi.hash b/buildroot/package/openipmi/openipmi.hash
similarity index 100%
rename from software/package/openipmi/openipmi.hash
rename to buildroot/package/openipmi/openipmi.hash
diff --git a/software/package/openipmi/openipmi.mk b/buildroot/package/openipmi/openipmi.mk
similarity index 100%
rename from software/package/openipmi/openipmi.mk
rename to buildroot/package/openipmi/openipmi.mk
diff --git a/software/package/openjdk-bin/openjdk-bin.hash b/buildroot/package/openjdk-bin/openjdk-bin.hash
similarity index 100%
rename from software/package/openjdk-bin/openjdk-bin.hash
rename to buildroot/package/openjdk-bin/openjdk-bin.hash
diff --git a/software/package/openjdk-bin/openjdk-bin.mk b/buildroot/package/openjdk-bin/openjdk-bin.mk
similarity index 100%
rename from software/package/openjdk-bin/openjdk-bin.mk
rename to buildroot/package/openjdk-bin/openjdk-bin.mk
diff --git a/software/package/openjdk/Config.in b/buildroot/package/openjdk/Config.in
similarity index 100%
rename from software/package/openjdk/Config.in
rename to buildroot/package/openjdk/Config.in
diff --git a/software/package/openjdk/openjdk.hash b/buildroot/package/openjdk/openjdk.hash
similarity index 100%
rename from software/package/openjdk/openjdk.hash
rename to buildroot/package/openjdk/openjdk.hash
diff --git a/software/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk
similarity index 100%
rename from software/package/openjdk/openjdk.mk
rename to buildroot/package/openjdk/openjdk.mk
diff --git a/software/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch b/buildroot/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch
similarity index 100%
rename from software/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch
rename to buildroot/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch
diff --git a/software/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/buildroot/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch
similarity index 100%
rename from software/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch
rename to buildroot/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch
diff --git a/software/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch b/buildroot/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch
similarity index 100%
rename from software/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch
rename to buildroot/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch
diff --git a/software/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch b/buildroot/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch
similarity index 100%
rename from software/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch
rename to buildroot/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch
diff --git a/software/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch b/buildroot/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch
similarity index 100%
rename from software/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch
rename to buildroot/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch
diff --git a/software/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch b/buildroot/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch
similarity index 100%
rename from software/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch
rename to buildroot/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch
diff --git a/software/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch b/buildroot/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch
similarity index 100%
rename from software/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch
rename to buildroot/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch
diff --git a/software/package/openjpeg/0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch b/buildroot/package/openjpeg/0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch
similarity index 100%
rename from software/package/openjpeg/0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch
rename to buildroot/package/openjpeg/0008-opj_decompress-fix-double-free-on-input-directory-with-mix-of-valid.patch
diff --git a/software/package/openjpeg/Config.in b/buildroot/package/openjpeg/Config.in
similarity index 100%
rename from software/package/openjpeg/Config.in
rename to buildroot/package/openjpeg/Config.in
diff --git a/software/package/openjpeg/openjpeg.hash b/buildroot/package/openjpeg/openjpeg.hash
similarity index 100%
rename from software/package/openjpeg/openjpeg.hash
rename to buildroot/package/openjpeg/openjpeg.hash
diff --git a/software/package/openjpeg/openjpeg.mk b/buildroot/package/openjpeg/openjpeg.mk
similarity index 100%
rename from software/package/openjpeg/openjpeg.mk
rename to buildroot/package/openjpeg/openjpeg.mk
diff --git a/software/package/openlayers/Config.in b/buildroot/package/openlayers/Config.in
similarity index 100%
rename from software/package/openlayers/Config.in
rename to buildroot/package/openlayers/Config.in
diff --git a/software/package/openlayers/openlayers.hash b/buildroot/package/openlayers/openlayers.hash
similarity index 100%
rename from software/package/openlayers/openlayers.hash
rename to buildroot/package/openlayers/openlayers.hash
diff --git a/software/package/openlayers/openlayers.mk b/buildroot/package/openlayers/openlayers.mk
similarity index 100%
rename from software/package/openlayers/openlayers.mk
rename to buildroot/package/openlayers/openlayers.mk
diff --git a/software/package/openldap/0001-fix_cross_strip.patch b/buildroot/package/openldap/0001-fix_cross_strip.patch
similarity index 100%
rename from software/package/openldap/0001-fix_cross_strip.patch
rename to buildroot/package/openldap/0001-fix_cross_strip.patch
diff --git a/software/package/openldap/0002-fix-bignum.patch b/buildroot/package/openldap/0002-fix-bignum.patch
similarity index 100%
rename from software/package/openldap/0002-fix-bignum.patch
rename to buildroot/package/openldap/0002-fix-bignum.patch
diff --git a/software/package/openldap/0003-disable-docs.patch b/buildroot/package/openldap/0003-disable-docs.patch
similarity index 100%
rename from software/package/openldap/0003-disable-docs.patch
rename to buildroot/package/openldap/0003-disable-docs.patch
diff --git a/software/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch b/buildroot/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
similarity index 100%
rename from software/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
rename to buildroot/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
diff --git a/software/package/openldap/Config.in b/buildroot/package/openldap/Config.in
similarity index 100%
rename from software/package/openldap/Config.in
rename to buildroot/package/openldap/Config.in
diff --git a/software/package/openldap/openldap.hash b/buildroot/package/openldap/openldap.hash
similarity index 100%
rename from software/package/openldap/openldap.hash
rename to buildroot/package/openldap/openldap.hash
diff --git a/software/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk
similarity index 100%
rename from software/package/openldap/openldap.mk
rename to buildroot/package/openldap/openldap.mk
diff --git a/software/package/openmpi/Config.in b/buildroot/package/openmpi/Config.in
similarity index 100%
rename from software/package/openmpi/Config.in
rename to buildroot/package/openmpi/Config.in
diff --git a/software/package/openmpi/openmpi-mips32-fortran.cache b/buildroot/package/openmpi/openmpi-mips32-fortran.cache
similarity index 100%
rename from software/package/openmpi/openmpi-mips32-fortran.cache
rename to buildroot/package/openmpi/openmpi-mips32-fortran.cache
diff --git a/software/package/openmpi/openmpi-mips64-fortran.cache b/buildroot/package/openmpi/openmpi-mips64-fortran.cache
similarity index 100%
rename from software/package/openmpi/openmpi-mips64-fortran.cache
rename to buildroot/package/openmpi/openmpi-mips64-fortran.cache
diff --git a/software/package/openmpi/openmpi.hash b/buildroot/package/openmpi/openmpi.hash
similarity index 100%
rename from software/package/openmpi/openmpi.hash
rename to buildroot/package/openmpi/openmpi.hash
diff --git a/software/package/openmpi/openmpi.mk b/buildroot/package/openmpi/openmpi.mk
similarity index 100%
rename from software/package/openmpi/openmpi.mk
rename to buildroot/package/openmpi/openmpi.mk
diff --git a/software/package/openntpd/0001-fix-musl.patch b/buildroot/package/openntpd/0001-fix-musl.patch
similarity index 100%
rename from software/package/openntpd/0001-fix-musl.patch
rename to buildroot/package/openntpd/0001-fix-musl.patch
diff --git a/software/package/openntpd/Config.in b/buildroot/package/openntpd/Config.in
similarity index 100%
rename from software/package/openntpd/Config.in
rename to buildroot/package/openntpd/Config.in
diff --git a/software/package/openntpd/S49ntp b/buildroot/package/openntpd/S49ntp
similarity index 100%
rename from software/package/openntpd/S49ntp
rename to buildroot/package/openntpd/S49ntp
diff --git a/software/package/openntpd/ntpd.service b/buildroot/package/openntpd/ntpd.service
similarity index 100%
rename from software/package/openntpd/ntpd.service
rename to buildroot/package/openntpd/ntpd.service
diff --git a/software/package/openntpd/openntpd.hash b/buildroot/package/openntpd/openntpd.hash
similarity index 100%
rename from software/package/openntpd/openntpd.hash
rename to buildroot/package/openntpd/openntpd.hash
diff --git a/software/package/openntpd/openntpd.mk b/buildroot/package/openntpd/openntpd.mk
similarity index 100%
rename from software/package/openntpd/openntpd.mk
rename to buildroot/package/openntpd/openntpd.mk
diff --git a/software/package/openobex/Config.in b/buildroot/package/openobex/Config.in
similarity index 100%
rename from software/package/openobex/Config.in
rename to buildroot/package/openobex/Config.in
diff --git a/software/package/openobex/openobex.hash b/buildroot/package/openobex/openobex.hash
similarity index 100%
rename from software/package/openobex/openobex.hash
rename to buildroot/package/openobex/openobex.hash
diff --git a/software/package/openobex/openobex.mk b/buildroot/package/openobex/openobex.mk
similarity index 100%
rename from software/package/openobex/openobex.mk
rename to buildroot/package/openobex/openobex.mk
diff --git a/software/package/openocd/0001-configure-enable-build-on-uclinux.patch b/buildroot/package/openocd/0001-configure-enable-build-on-uclinux.patch
similarity index 100%
rename from software/package/openocd/0001-configure-enable-build-on-uclinux.patch
rename to buildroot/package/openocd/0001-configure-enable-build-on-uclinux.patch
diff --git a/software/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch b/buildroot/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
similarity index 100%
rename from software/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
rename to buildroot/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
diff --git a/software/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch b/buildroot/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
similarity index 100%
rename from software/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
rename to buildroot/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
diff --git a/software/package/openocd/Config.in b/buildroot/package/openocd/Config.in
similarity index 100%
rename from software/package/openocd/Config.in
rename to buildroot/package/openocd/Config.in
diff --git a/software/package/openocd/Config.in.host b/buildroot/package/openocd/Config.in.host
similarity index 100%
rename from software/package/openocd/Config.in.host
rename to buildroot/package/openocd/Config.in.host
diff --git a/software/package/openocd/openocd.hash b/buildroot/package/openocd/openocd.hash
similarity index 100%
rename from software/package/openocd/openocd.hash
rename to buildroot/package/openocd/openocd.hash
diff --git a/software/package/openocd/openocd.mk b/buildroot/package/openocd/openocd.mk
similarity index 100%
rename from software/package/openocd/openocd.mk
rename to buildroot/package/openocd/openocd.mk
diff --git a/software/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch b/buildroot/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch
similarity index 100%
rename from software/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch
rename to buildroot/package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch
diff --git a/software/package/openpgm/0002-cross-compile.patch b/buildroot/package/openpgm/0002-cross-compile.patch
similarity index 100%
rename from software/package/openpgm/0002-cross-compile.patch
rename to buildroot/package/openpgm/0002-cross-compile.patch
diff --git a/software/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch b/buildroot/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch
similarity index 100%
rename from software/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch
rename to buildroot/package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch
diff --git a/software/package/openpgm/Config.in b/buildroot/package/openpgm/Config.in
similarity index 100%
rename from software/package/openpgm/Config.in
rename to buildroot/package/openpgm/Config.in
diff --git a/software/package/openpgm/openpgm.hash b/buildroot/package/openpgm/openpgm.hash
similarity index 100%
rename from software/package/openpgm/openpgm.hash
rename to buildroot/package/openpgm/openpgm.hash
diff --git a/software/package/openpgm/openpgm.mk b/buildroot/package/openpgm/openpgm.mk
similarity index 100%
rename from software/package/openpgm/openpgm.mk
rename to buildroot/package/openpgm/openpgm.mk
diff --git a/software/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch b/buildroot/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch
similarity index 100%
rename from software/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch
rename to buildroot/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch
diff --git a/software/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch b/buildroot/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch
similarity index 100%
rename from software/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch
rename to buildroot/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch
diff --git a/software/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch b/buildroot/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch
similarity index 100%
rename from software/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch
rename to buildroot/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch
diff --git a/software/package/openpowerlink/Config.in b/buildroot/package/openpowerlink/Config.in
similarity index 100%
rename from software/package/openpowerlink/Config.in
rename to buildroot/package/openpowerlink/Config.in
diff --git a/software/package/openpowerlink/openpowerlink.hash b/buildroot/package/openpowerlink/openpowerlink.hash
similarity index 100%
rename from software/package/openpowerlink/openpowerlink.hash
rename to buildroot/package/openpowerlink/openpowerlink.hash
diff --git a/software/package/openpowerlink/openpowerlink.mk b/buildroot/package/openpowerlink/openpowerlink.mk
similarity index 100%
rename from software/package/openpowerlink/openpowerlink.mk
rename to buildroot/package/openpowerlink/openpowerlink.mk
diff --git a/software/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch b/buildroot/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
similarity index 100%
rename from software/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
rename to buildroot/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
diff --git a/software/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch b/buildroot/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
similarity index 100%
rename from software/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
rename to buildroot/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
diff --git a/software/package/openrc/Config.in b/buildroot/package/openrc/Config.in
similarity index 100%
rename from software/package/openrc/Config.in
rename to buildroot/package/openrc/Config.in
diff --git a/software/package/openrc/getty b/buildroot/package/openrc/getty
similarity index 100%
rename from software/package/openrc/getty
rename to buildroot/package/openrc/getty
diff --git a/software/package/openrc/openrc.hash b/buildroot/package/openrc/openrc.hash
similarity index 100%
rename from software/package/openrc/openrc.hash
rename to buildroot/package/openrc/openrc.hash
diff --git a/software/package/openrc/openrc.mk b/buildroot/package/openrc/openrc.mk
similarity index 100%
rename from software/package/openrc/openrc.mk
rename to buildroot/package/openrc/openrc.mk
diff --git a/software/package/openrc/sysv-rcs b/buildroot/package/openrc/sysv-rcs
similarity index 100%
rename from software/package/openrc/sysv-rcs
rename to buildroot/package/openrc/sysv-rcs
diff --git a/software/package/openresolv/Config.in b/buildroot/package/openresolv/Config.in
similarity index 100%
rename from software/package/openresolv/Config.in
rename to buildroot/package/openresolv/Config.in
diff --git a/software/package/openresolv/openresolv.hash b/buildroot/package/openresolv/openresolv.hash
similarity index 100%
rename from software/package/openresolv/openresolv.hash
rename to buildroot/package/openresolv/openresolv.hash
diff --git a/software/package/openresolv/openresolv.mk b/buildroot/package/openresolv/openresolv.mk
similarity index 100%
rename from software/package/openresolv/openresolv.mk
rename to buildroot/package/openresolv/openresolv.mk
diff --git a/software/package/openssh/Config.in b/buildroot/package/openssh/Config.in
similarity index 100%
rename from software/package/openssh/Config.in
rename to buildroot/package/openssh/Config.in
diff --git a/software/package/openssh/S50sshd b/buildroot/package/openssh/S50sshd
similarity index 100%
rename from software/package/openssh/S50sshd
rename to buildroot/package/openssh/S50sshd
diff --git a/software/package/openssh/openssh.hash b/buildroot/package/openssh/openssh.hash
similarity index 100%
rename from software/package/openssh/openssh.hash
rename to buildroot/package/openssh/openssh.hash
diff --git a/software/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk
similarity index 100%
rename from software/package/openssh/openssh.mk
rename to buildroot/package/openssh/openssh.mk
diff --git a/software/package/openssh/sshd-sysusers.conf b/buildroot/package/openssh/sshd-sysusers.conf
similarity index 100%
rename from software/package/openssh/sshd-sysusers.conf
rename to buildroot/package/openssh/sshd-sysusers.conf
diff --git a/software/package/openssh/sshd.service b/buildroot/package/openssh/sshd.service
similarity index 100%
rename from software/package/openssh/sshd.service
rename to buildroot/package/openssh/sshd.service
diff --git a/software/package/openssl/Config.in b/buildroot/package/openssl/Config.in
similarity index 100%
rename from software/package/openssl/Config.in
rename to buildroot/package/openssl/Config.in
diff --git a/software/package/openssl/openssl.mk b/buildroot/package/openssl/openssl.mk
similarity index 100%
rename from software/package/openssl/openssl.mk
rename to buildroot/package/openssl/openssl.mk
diff --git a/software/package/openswan/Config.in b/buildroot/package/openswan/Config.in
similarity index 100%
rename from software/package/openswan/Config.in
rename to buildroot/package/openswan/Config.in
diff --git a/software/package/openswan/openswan.hash b/buildroot/package/openswan/openswan.hash
similarity index 100%
rename from software/package/openswan/openswan.hash
rename to buildroot/package/openswan/openswan.hash
diff --git a/software/package/openswan/openswan.mk b/buildroot/package/openswan/openswan.mk
similarity index 100%
rename from software/package/openswan/openswan.mk
rename to buildroot/package/openswan/openswan.mk
diff --git a/software/package/opentracing-cpp/Config.in b/buildroot/package/opentracing-cpp/Config.in
similarity index 100%
rename from software/package/opentracing-cpp/Config.in
rename to buildroot/package/opentracing-cpp/Config.in
diff --git a/software/package/opentracing-cpp/opentracing-cpp.hash b/buildroot/package/opentracing-cpp/opentracing-cpp.hash
similarity index 100%
rename from software/package/opentracing-cpp/opentracing-cpp.hash
rename to buildroot/package/opentracing-cpp/opentracing-cpp.hash
diff --git a/software/package/opentracing-cpp/opentracing-cpp.mk b/buildroot/package/opentracing-cpp/opentracing-cpp.mk
similarity index 100%
rename from software/package/opentracing-cpp/opentracing-cpp.mk
rename to buildroot/package/opentracing-cpp/opentracing-cpp.mk
diff --git a/software/package/opentyrian-data/Config.in b/buildroot/package/opentyrian-data/Config.in
similarity index 100%
rename from software/package/opentyrian-data/Config.in
rename to buildroot/package/opentyrian-data/Config.in
diff --git a/software/package/opentyrian-data/opentyrian-data.hash b/buildroot/package/opentyrian-data/opentyrian-data.hash
similarity index 100%
rename from software/package/opentyrian-data/opentyrian-data.hash
rename to buildroot/package/opentyrian-data/opentyrian-data.hash
diff --git a/software/package/opentyrian-data/opentyrian-data.mk b/buildroot/package/opentyrian-data/opentyrian-data.mk
similarity index 100%
rename from software/package/opentyrian-data/opentyrian-data.mk
rename to buildroot/package/opentyrian-data/opentyrian-data.mk
diff --git a/software/package/opentyrian/Config.in b/buildroot/package/opentyrian/Config.in
similarity index 100%
rename from software/package/opentyrian/Config.in
rename to buildroot/package/opentyrian/Config.in
diff --git a/software/package/opentyrian/opentyrian.mk b/buildroot/package/opentyrian/opentyrian.mk
similarity index 100%
rename from software/package/opentyrian/opentyrian.mk
rename to buildroot/package/opentyrian/opentyrian.mk
diff --git a/software/package/openvmtools/0001-no_cflags_werror.patch b/buildroot/package/openvmtools/0001-no_cflags_werror.patch
similarity index 100%
rename from software/package/openvmtools/0001-no_cflags_werror.patch
rename to buildroot/package/openvmtools/0001-no_cflags_werror.patch
diff --git a/software/package/openvmtools/0002-dont-force-cppflags.patch b/buildroot/package/openvmtools/0002-dont-force-cppflags.patch
similarity index 100%
rename from software/package/openvmtools/0002-dont-force-cppflags.patch
rename to buildroot/package/openvmtools/0002-dont-force-cppflags.patch
diff --git a/software/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch b/buildroot/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch
similarity index 100%
rename from software/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch
rename to buildroot/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch
diff --git a/software/package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch b/buildroot/package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch
similarity index 100%
rename from software/package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch
rename to buildroot/package/openvmtools/0004-Remove-assumptions-about-glibc-being-only-libc-imple.patch
diff --git a/software/package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch b/buildroot/package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch
similarity index 100%
rename from software/package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch
rename to buildroot/package/openvmtools/0005-Use-configure-test-for-struct-timespec.patch
diff --git a/software/package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/buildroot/package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
similarity index 100%
rename from software/package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
rename to buildroot/package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
diff --git a/software/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/buildroot/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch
similarity index 100%
rename from software/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch
rename to buildroot/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch
diff --git a/software/package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch b/buildroot/package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch
similarity index 100%
rename from software/package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch
rename to buildroot/package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch
diff --git a/software/package/openvmtools/0009-Set-permissions-on-rules-file.patch b/buildroot/package/openvmtools/0009-Set-permissions-on-rules-file.patch
similarity index 100%
rename from software/package/openvmtools/0009-Set-permissions-on-rules-file.patch
rename to buildroot/package/openvmtools/0009-Set-permissions-on-rules-file.patch
diff --git a/software/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch b/buildroot/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch
similarity index 100%
rename from software/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch
rename to buildroot/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch
diff --git a/software/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch b/buildroot/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch
similarity index 100%
rename from software/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch
rename to buildroot/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch
diff --git a/software/package/openvmtools/Config.in b/buildroot/package/openvmtools/Config.in
similarity index 100%
rename from software/package/openvmtools/Config.in
rename to buildroot/package/openvmtools/Config.in
diff --git a/software/package/openvmtools/S10vmtoolsd b/buildroot/package/openvmtools/S10vmtoolsd
similarity index 100%
rename from software/package/openvmtools/S10vmtoolsd
rename to buildroot/package/openvmtools/S10vmtoolsd
diff --git a/software/package/openvmtools/openvmtools.hash b/buildroot/package/openvmtools/openvmtools.hash
similarity index 100%
rename from software/package/openvmtools/openvmtools.hash
rename to buildroot/package/openvmtools/openvmtools.hash
diff --git a/software/package/openvmtools/openvmtools.mk b/buildroot/package/openvmtools/openvmtools.mk
similarity index 100%
rename from software/package/openvmtools/openvmtools.mk
rename to buildroot/package/openvmtools/openvmtools.mk
diff --git a/software/package/openvmtools/shutdown b/buildroot/package/openvmtools/shutdown
similarity index 100%
rename from software/package/openvmtools/shutdown
rename to buildroot/package/openvmtools/shutdown
diff --git a/software/package/openvmtools/vmtoolsd.service b/buildroot/package/openvmtools/vmtoolsd.service
similarity index 100%
rename from software/package/openvmtools/vmtoolsd.service
rename to buildroot/package/openvmtools/vmtoolsd.service
diff --git a/software/package/openvpn/Config.in b/buildroot/package/openvpn/Config.in
similarity index 100%
rename from software/package/openvpn/Config.in
rename to buildroot/package/openvpn/Config.in
diff --git a/software/package/openvpn/S60openvpn b/buildroot/package/openvpn/S60openvpn
similarity index 100%
rename from software/package/openvpn/S60openvpn
rename to buildroot/package/openvpn/S60openvpn
diff --git a/software/package/openvpn/openvpn.hash b/buildroot/package/openvpn/openvpn.hash
similarity index 100%
rename from software/package/openvpn/openvpn.hash
rename to buildroot/package/openvpn/openvpn.hash
diff --git a/software/package/openvpn/openvpn.mk b/buildroot/package/openvpn/openvpn.mk
similarity index 100%
rename from software/package/openvpn/openvpn.mk
rename to buildroot/package/openvpn/openvpn.mk
diff --git a/software/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch b/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch
similarity index 100%
rename from software/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch
rename to buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch
diff --git a/software/package/openzwave/0002-update-spec-files.patch b/buildroot/package/openzwave/0002-update-spec-files.patch
similarity index 100%
rename from software/package/openzwave/0002-update-spec-files.patch
rename to buildroot/package/openzwave/0002-update-spec-files.patch
diff --git a/software/package/openzwave/Config.in b/buildroot/package/openzwave/Config.in
similarity index 100%
rename from software/package/openzwave/Config.in
rename to buildroot/package/openzwave/Config.in
diff --git a/software/package/openzwave/openzwave.hash b/buildroot/package/openzwave/openzwave.hash
similarity index 100%
rename from software/package/openzwave/openzwave.hash
rename to buildroot/package/openzwave/openzwave.hash
diff --git a/software/package/openzwave/openzwave.mk b/buildroot/package/openzwave/openzwave.mk
similarity index 100%
rename from software/package/openzwave/openzwave.mk
rename to buildroot/package/openzwave/openzwave.mk
diff --git a/software/package/opkg-utils/Config.in.host b/buildroot/package/opkg-utils/Config.in.host
similarity index 100%
rename from software/package/opkg-utils/Config.in.host
rename to buildroot/package/opkg-utils/Config.in.host
diff --git a/software/package/opkg-utils/opkg-utils.hash b/buildroot/package/opkg-utils/opkg-utils.hash
similarity index 100%
rename from software/package/opkg-utils/opkg-utils.hash
rename to buildroot/package/opkg-utils/opkg-utils.hash
diff --git a/software/package/opkg-utils/opkg-utils.mk b/buildroot/package/opkg-utils/opkg-utils.mk
similarity index 100%
rename from software/package/opkg-utils/opkg-utils.mk
rename to buildroot/package/opkg-utils/opkg-utils.mk
diff --git a/software/package/opkg/Config.in b/buildroot/package/opkg/Config.in
similarity index 100%
rename from software/package/opkg/Config.in
rename to buildroot/package/opkg/Config.in
diff --git a/software/package/opkg/opkg.hash b/buildroot/package/opkg/opkg.hash
similarity index 100%
rename from software/package/opkg/opkg.hash
rename to buildroot/package/opkg/opkg.hash
diff --git a/software/package/opkg/opkg.mk b/buildroot/package/opkg/opkg.mk
similarity index 100%
rename from software/package/opkg/opkg.mk
rename to buildroot/package/opkg/opkg.mk
diff --git a/software/package/oprofile/0001-musl.patch b/buildroot/package/oprofile/0001-musl.patch
similarity index 100%
rename from software/package/oprofile/0001-musl.patch
rename to buildroot/package/oprofile/0001-musl.patch
diff --git a/software/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch b/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch
similarity index 100%
rename from software/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch
rename to buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch
diff --git a/software/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch b/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch
similarity index 100%
rename from software/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch
rename to buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch
diff --git a/software/package/oprofile/Config.in b/buildroot/package/oprofile/Config.in
similarity index 100%
rename from software/package/oprofile/Config.in
rename to buildroot/package/oprofile/Config.in
diff --git a/software/package/oprofile/oprofile.hash b/buildroot/package/oprofile/oprofile.hash
similarity index 100%
rename from software/package/oprofile/oprofile.hash
rename to buildroot/package/oprofile/oprofile.hash
diff --git a/software/package/oprofile/oprofile.mk b/buildroot/package/oprofile/oprofile.mk
similarity index 100%
rename from software/package/oprofile/oprofile.mk
rename to buildroot/package/oprofile/oprofile.mk
diff --git a/software/package/optee-benchmark/Config.in b/buildroot/package/optee-benchmark/Config.in
similarity index 100%
rename from software/package/optee-benchmark/Config.in
rename to buildroot/package/optee-benchmark/Config.in
diff --git a/software/package/optee-benchmark/optee-benchmark.hash b/buildroot/package/optee-benchmark/optee-benchmark.hash
similarity index 100%
rename from software/package/optee-benchmark/optee-benchmark.hash
rename to buildroot/package/optee-benchmark/optee-benchmark.hash
diff --git a/software/package/optee-benchmark/optee-benchmark.mk b/buildroot/package/optee-benchmark/optee-benchmark.mk
similarity index 100%
rename from software/package/optee-benchmark/optee-benchmark.mk
rename to buildroot/package/optee-benchmark/optee-benchmark.mk
diff --git a/software/package/optee-client/Config.in b/buildroot/package/optee-client/Config.in
similarity index 100%
rename from software/package/optee-client/Config.in
rename to buildroot/package/optee-client/Config.in
diff --git a/software/package/optee-client/S30optee b/buildroot/package/optee-client/S30optee
similarity index 100%
rename from software/package/optee-client/S30optee
rename to buildroot/package/optee-client/S30optee
diff --git a/software/package/optee-client/optee-client.hash b/buildroot/package/optee-client/optee-client.hash
similarity index 100%
rename from software/package/optee-client/optee-client.hash
rename to buildroot/package/optee-client/optee-client.hash
diff --git a/software/package/optee-client/optee-client.mk b/buildroot/package/optee-client/optee-client.mk
similarity index 100%
rename from software/package/optee-client/optee-client.mk
rename to buildroot/package/optee-client/optee-client.mk
diff --git a/software/package/optee-examples/Config.in b/buildroot/package/optee-examples/Config.in
similarity index 100%
rename from software/package/optee-examples/Config.in
rename to buildroot/package/optee-examples/Config.in
diff --git a/software/package/optee-examples/optee-examples.hash b/buildroot/package/optee-examples/optee-examples.hash
similarity index 100%
rename from software/package/optee-examples/optee-examples.hash
rename to buildroot/package/optee-examples/optee-examples.hash
diff --git a/software/package/optee-examples/optee-examples.mk b/buildroot/package/optee-examples/optee-examples.mk
similarity index 100%
rename from software/package/optee-examples/optee-examples.mk
rename to buildroot/package/optee-examples/optee-examples.mk
diff --git a/software/package/optee-test/0001-use-python3-instead-of-python.patch b/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch
similarity index 100%
rename from software/package/optee-test/0001-use-python3-instead-of-python.patch
rename to buildroot/package/optee-test/0001-use-python3-instead-of-python.patch
diff --git a/software/package/optee-test/Config.in b/buildroot/package/optee-test/Config.in
similarity index 100%
rename from software/package/optee-test/Config.in
rename to buildroot/package/optee-test/Config.in
diff --git a/software/package/optee-test/optee-test.hash b/buildroot/package/optee-test/optee-test.hash
similarity index 100%
rename from software/package/optee-test/optee-test.hash
rename to buildroot/package/optee-test/optee-test.hash
diff --git a/software/package/optee-test/optee-test.mk b/buildroot/package/optee-test/optee-test.mk
similarity index 100%
rename from software/package/optee-test/optee-test.mk
rename to buildroot/package/optee-test/optee-test.mk
diff --git a/software/package/opus-tools/Config.in b/buildroot/package/opus-tools/Config.in
similarity index 100%
rename from software/package/opus-tools/Config.in
rename to buildroot/package/opus-tools/Config.in
diff --git a/software/package/opus-tools/opus-tools.hash b/buildroot/package/opus-tools/opus-tools.hash
similarity index 100%
rename from software/package/opus-tools/opus-tools.hash
rename to buildroot/package/opus-tools/opus-tools.hash
diff --git a/software/package/opus-tools/opus-tools.mk b/buildroot/package/opus-tools/opus-tools.mk
similarity index 100%
rename from software/package/opus-tools/opus-tools.mk
rename to buildroot/package/opus-tools/opus-tools.mk
diff --git a/software/package/opus/Config.in b/buildroot/package/opus/Config.in
similarity index 100%
rename from software/package/opus/Config.in
rename to buildroot/package/opus/Config.in
diff --git a/software/package/opus/opus.hash b/buildroot/package/opus/opus.hash
similarity index 100%
rename from software/package/opus/opus.hash
rename to buildroot/package/opus/opus.hash
diff --git a/software/package/opus/opus.mk b/buildroot/package/opus/opus.mk
similarity index 100%
rename from software/package/opus/opus.mk
rename to buildroot/package/opus/opus.mk
diff --git a/software/package/opusfile/Config.in b/buildroot/package/opusfile/Config.in
similarity index 100%
rename from software/package/opusfile/Config.in
rename to buildroot/package/opusfile/Config.in
diff --git a/software/package/opusfile/opusfile.hash b/buildroot/package/opusfile/opusfile.hash
similarity index 100%
rename from software/package/opusfile/opusfile.hash
rename to buildroot/package/opusfile/opusfile.hash
diff --git a/software/package/opusfile/opusfile.mk b/buildroot/package/opusfile/opusfile.mk
similarity index 100%
rename from software/package/opusfile/opusfile.mk
rename to buildroot/package/opusfile/opusfile.mk
diff --git a/software/package/oracle-mysql/0000-ac_cache_check.patch b/buildroot/package/oracle-mysql/0000-ac_cache_check.patch
similarity index 100%
rename from software/package/oracle-mysql/0000-ac_cache_check.patch
rename to buildroot/package/oracle-mysql/0000-ac_cache_check.patch
diff --git a/software/package/oracle-mysql/0001-configure-ps-cache-check.patch b/buildroot/package/oracle-mysql/0001-configure-ps-cache-check.patch
similarity index 100%
rename from software/package/oracle-mysql/0001-configure-ps-cache-check.patch
rename to buildroot/package/oracle-mysql/0001-configure-ps-cache-check.patch
diff --git a/software/package/oracle-mysql/0002-use-new-readline-iface.patch b/buildroot/package/oracle-mysql/0002-use-new-readline-iface.patch
similarity index 100%
rename from software/package/oracle-mysql/0002-use-new-readline-iface.patch
rename to buildroot/package/oracle-mysql/0002-use-new-readline-iface.patch
diff --git a/software/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch b/buildroot/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch
similarity index 100%
rename from software/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch
rename to buildroot/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch
diff --git a/software/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch b/buildroot/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch
similarity index 100%
rename from software/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch
rename to buildroot/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch
diff --git a/software/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch b/buildroot/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch
similarity index 100%
rename from software/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch
rename to buildroot/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch
diff --git a/software/package/oracle-mysql/0006-no-force-static-build.patch b/buildroot/package/oracle-mysql/0006-no-force-static-build.patch
similarity index 100%
rename from software/package/oracle-mysql/0006-no-force-static-build.patch
rename to buildroot/package/oracle-mysql/0006-no-force-static-build.patch
diff --git a/software/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch b/buildroot/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch
similarity index 100%
rename from software/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch
rename to buildroot/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch
diff --git a/software/package/oracle-mysql/0008-fix-type-conversion.patch b/buildroot/package/oracle-mysql/0008-fix-type-conversion.patch
similarity index 100%
rename from software/package/oracle-mysql/0008-fix-type-conversion.patch
rename to buildroot/package/oracle-mysql/0008-fix-type-conversion.patch
diff --git a/software/package/oracle-mysql/0009-gcc7.patch b/buildroot/package/oracle-mysql/0009-gcc7.patch
similarity index 100%
rename from software/package/oracle-mysql/0009-gcc7.patch
rename to buildroot/package/oracle-mysql/0009-gcc7.patch
diff --git a/software/package/oracle-mysql/0010-fix-build-without-zlib.patch b/buildroot/package/oracle-mysql/0010-fix-build-without-zlib.patch
similarity index 100%
rename from software/package/oracle-mysql/0010-fix-build-without-zlib.patch
rename to buildroot/package/oracle-mysql/0010-fix-build-without-zlib.patch
diff --git a/software/package/oracle-mysql/S97mysqld b/buildroot/package/oracle-mysql/S97mysqld
similarity index 100%
rename from software/package/oracle-mysql/S97mysqld
rename to buildroot/package/oracle-mysql/S97mysqld
diff --git a/software/package/oracle-mysql/mysqld.service b/buildroot/package/oracle-mysql/mysqld.service
similarity index 100%
rename from software/package/oracle-mysql/mysqld.service
rename to buildroot/package/oracle-mysql/mysqld.service
diff --git a/software/package/oracle-mysql/oracle-mysql.hash b/buildroot/package/oracle-mysql/oracle-mysql.hash
similarity index 100%
rename from software/package/oracle-mysql/oracle-mysql.hash
rename to buildroot/package/oracle-mysql/oracle-mysql.hash
diff --git a/software/package/oracle-mysql/oracle-mysql.mk b/buildroot/package/oracle-mysql/oracle-mysql.mk
similarity index 100%
rename from software/package/oracle-mysql/oracle-mysql.mk
rename to buildroot/package/oracle-mysql/oracle-mysql.mk
diff --git a/software/package/orbit/Config.in b/buildroot/package/orbit/Config.in
similarity index 100%
rename from software/package/orbit/Config.in
rename to buildroot/package/orbit/Config.in
diff --git a/software/package/orbit/orbit.hash b/buildroot/package/orbit/orbit.hash
similarity index 100%
rename from software/package/orbit/orbit.hash
rename to buildroot/package/orbit/orbit.hash
diff --git a/software/package/orbit/orbit.mk b/buildroot/package/orbit/orbit.mk
similarity index 100%
rename from software/package/orbit/orbit.mk
rename to buildroot/package/orbit/orbit.mk
diff --git a/software/package/orc/Config.in b/buildroot/package/orc/Config.in
similarity index 100%
rename from software/package/orc/Config.in
rename to buildroot/package/orc/Config.in
diff --git a/software/package/orc/orc.hash b/buildroot/package/orc/orc.hash
similarity index 100%
rename from software/package/orc/orc.hash
rename to buildroot/package/orc/orc.hash
diff --git a/software/package/orc/orc.mk b/buildroot/package/orc/orc.mk
similarity index 100%
rename from software/package/orc/orc.mk
rename to buildroot/package/orc/orc.mk
diff --git a/software/package/ortp/Config.in b/buildroot/package/ortp/Config.in
similarity index 100%
rename from software/package/ortp/Config.in
rename to buildroot/package/ortp/Config.in
diff --git a/software/package/ortp/ortp.hash b/buildroot/package/ortp/ortp.hash
similarity index 100%
rename from software/package/ortp/ortp.hash
rename to buildroot/package/ortp/ortp.hash
diff --git a/software/package/ortp/ortp.mk b/buildroot/package/ortp/ortp.mk
similarity index 100%
rename from software/package/ortp/ortp.mk
rename to buildroot/package/ortp/ortp.mk
diff --git a/software/package/owfs/Config.in b/buildroot/package/owfs/Config.in
similarity index 100%
rename from software/package/owfs/Config.in
rename to buildroot/package/owfs/Config.in
diff --git a/software/package/owfs/S55owserver b/buildroot/package/owfs/S55owserver
similarity index 100%
rename from software/package/owfs/S55owserver
rename to buildroot/package/owfs/S55owserver
diff --git a/software/package/owfs/S60owfs b/buildroot/package/owfs/S60owfs
similarity index 100%
rename from software/package/owfs/S60owfs
rename to buildroot/package/owfs/S60owfs
diff --git a/software/package/owfs/owfs.hash b/buildroot/package/owfs/owfs.hash
similarity index 100%
rename from software/package/owfs/owfs.hash
rename to buildroot/package/owfs/owfs.hash
diff --git a/software/package/owfs/owfs.mk b/buildroot/package/owfs/owfs.mk
similarity index 100%
rename from software/package/owfs/owfs.mk
rename to buildroot/package/owfs/owfs.mk
diff --git a/software/package/owl-linux/0001-fix-for-linux-3.3.x.patch b/buildroot/package/owl-linux/0001-fix-for-linux-3.3.x.patch
similarity index 100%
rename from software/package/owl-linux/0001-fix-for-linux-3.3.x.patch
rename to buildroot/package/owl-linux/0001-fix-for-linux-3.3.x.patch
diff --git a/software/package/owl-linux/Config.in b/buildroot/package/owl-linux/Config.in
similarity index 100%
rename from software/package/owl-linux/Config.in
rename to buildroot/package/owl-linux/Config.in
diff --git a/software/package/owl-linux/owl-linux.hash b/buildroot/package/owl-linux/owl-linux.hash
similarity index 100%
rename from software/package/owl-linux/owl-linux.hash
rename to buildroot/package/owl-linux/owl-linux.hash
diff --git a/software/package/owl-linux/owl-linux.mk b/buildroot/package/owl-linux/owl-linux.mk
similarity index 100%
rename from software/package/owl-linux/owl-linux.mk
rename to buildroot/package/owl-linux/owl-linux.mk
diff --git a/software/package/p11-kit/Config.in b/buildroot/package/p11-kit/Config.in
similarity index 100%
rename from software/package/p11-kit/Config.in
rename to buildroot/package/p11-kit/Config.in
diff --git a/software/package/p11-kit/p11-kit.hash b/buildroot/package/p11-kit/p11-kit.hash
similarity index 100%
rename from software/package/p11-kit/p11-kit.hash
rename to buildroot/package/p11-kit/p11-kit.hash
diff --git a/software/package/p11-kit/p11-kit.mk b/buildroot/package/p11-kit/p11-kit.mk
similarity index 100%
rename from software/package/p11-kit/p11-kit.mk
rename to buildroot/package/p11-kit/p11-kit.mk
diff --git a/software/package/p7zip/0001-CVE-2016-9296.patch b/buildroot/package/p7zip/0001-CVE-2016-9296.patch
similarity index 100%
rename from software/package/p7zip/0001-CVE-2016-9296.patch
rename to buildroot/package/p7zip/0001-CVE-2016-9296.patch
diff --git a/software/package/p7zip/0002-CVE-2017-17969.patch b/buildroot/package/p7zip/0002-CVE-2017-17969.patch
similarity index 100%
rename from software/package/p7zip/0002-CVE-2017-17969.patch
rename to buildroot/package/p7zip/0002-CVE-2017-17969.patch
diff --git a/software/package/p7zip/0003-CVE-2018-5996.patch b/buildroot/package/p7zip/0003-CVE-2018-5996.patch
similarity index 100%
rename from software/package/p7zip/0003-CVE-2018-5996.patch
rename to buildroot/package/p7zip/0003-CVE-2018-5996.patch
diff --git a/software/package/p7zip/Config.in b/buildroot/package/p7zip/Config.in
similarity index 100%
rename from software/package/p7zip/Config.in
rename to buildroot/package/p7zip/Config.in
diff --git a/software/package/p7zip/p7zip.hash b/buildroot/package/p7zip/p7zip.hash
similarity index 100%
rename from software/package/p7zip/p7zip.hash
rename to buildroot/package/p7zip/p7zip.hash
diff --git a/software/package/p7zip/p7zip.mk b/buildroot/package/p7zip/p7zip.mk
similarity index 100%
rename from software/package/p7zip/p7zip.mk
rename to buildroot/package/p7zip/p7zip.mk
diff --git a/software/package/p910nd/Config.in b/buildroot/package/p910nd/Config.in
similarity index 100%
rename from software/package/p910nd/Config.in
rename to buildroot/package/p910nd/Config.in
diff --git a/software/package/p910nd/p910nd.hash b/buildroot/package/p910nd/p910nd.hash
similarity index 100%
rename from software/package/p910nd/p910nd.hash
rename to buildroot/package/p910nd/p910nd.hash
diff --git a/software/package/p910nd/p910nd.mk b/buildroot/package/p910nd/p910nd.mk
similarity index 100%
rename from software/package/p910nd/p910nd.mk
rename to buildroot/package/p910nd/p910nd.mk
diff --git a/software/package/paho-mqtt-c/Config.in b/buildroot/package/paho-mqtt-c/Config.in
similarity index 100%
rename from software/package/paho-mqtt-c/Config.in
rename to buildroot/package/paho-mqtt-c/Config.in
diff --git a/software/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
similarity index 100%
rename from software/package/paho-mqtt-c/paho-mqtt-c.hash
rename to buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
diff --git a/software/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
similarity index 100%
rename from software/package/paho-mqtt-c/paho-mqtt-c.mk
rename to buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
diff --git a/software/package/paho-mqtt-cpp/Config.in b/buildroot/package/paho-mqtt-cpp/Config.in
similarity index 100%
rename from software/package/paho-mqtt-cpp/Config.in
rename to buildroot/package/paho-mqtt-cpp/Config.in
diff --git a/software/package/paho-mqtt-cpp/paho-mqtt-cpp.hash b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.hash
similarity index 100%
rename from software/package/paho-mqtt-cpp/paho-mqtt-cpp.hash
rename to buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.hash
diff --git a/software/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk
similarity index 100%
rename from software/package/paho-mqtt-cpp/paho-mqtt-cpp.mk
rename to buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk
diff --git a/software/package/pamtester/Config.in b/buildroot/package/pamtester/Config.in
similarity index 100%
rename from software/package/pamtester/Config.in
rename to buildroot/package/pamtester/Config.in
diff --git a/software/package/pamtester/pamtester.hash b/buildroot/package/pamtester/pamtester.hash
similarity index 100%
rename from software/package/pamtester/pamtester.hash
rename to buildroot/package/pamtester/pamtester.hash
diff --git a/software/package/pamtester/pamtester.mk b/buildroot/package/pamtester/pamtester.mk
similarity index 100%
rename from software/package/pamtester/pamtester.mk
rename to buildroot/package/pamtester/pamtester.mk
diff --git a/software/package/pango/Config.in b/buildroot/package/pango/Config.in
similarity index 100%
rename from software/package/pango/Config.in
rename to buildroot/package/pango/Config.in
diff --git a/software/package/pango/pango.hash b/buildroot/package/pango/pango.hash
similarity index 100%
rename from software/package/pango/pango.hash
rename to buildroot/package/pango/pango.hash
diff --git a/software/package/pango/pango.mk b/buildroot/package/pango/pango.mk
similarity index 100%
rename from software/package/pango/pango.mk
rename to buildroot/package/pango/pango.mk
diff --git a/software/package/pangomm/Config.in b/buildroot/package/pangomm/Config.in
similarity index 100%
rename from software/package/pangomm/Config.in
rename to buildroot/package/pangomm/Config.in
diff --git a/software/package/pangomm/pangomm.hash b/buildroot/package/pangomm/pangomm.hash
similarity index 100%
rename from software/package/pangomm/pangomm.hash
rename to buildroot/package/pangomm/pangomm.hash
diff --git a/software/package/pangomm/pangomm.mk b/buildroot/package/pangomm/pangomm.mk
similarity index 100%
rename from software/package/pangomm/pangomm.mk
rename to buildroot/package/pangomm/pangomm.mk
diff --git a/software/package/parted/Config.in b/buildroot/package/parted/Config.in
similarity index 100%
rename from software/package/parted/Config.in
rename to buildroot/package/parted/Config.in
diff --git a/software/package/parted/Config.in.host b/buildroot/package/parted/Config.in.host
similarity index 100%
rename from software/package/parted/Config.in.host
rename to buildroot/package/parted/Config.in.host
diff --git a/software/package/parted/parted.hash b/buildroot/package/parted/parted.hash
similarity index 100%
rename from software/package/parted/parted.hash
rename to buildroot/package/parted/parted.hash
diff --git a/software/package/parted/parted.mk b/buildroot/package/parted/parted.mk
similarity index 100%
rename from software/package/parted/parted.mk
rename to buildroot/package/parted/parted.mk
diff --git a/software/package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch b/buildroot/package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch
similarity index 100%
rename from software/package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch
rename to buildroot/package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch
diff --git a/software/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch b/buildroot/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch
similarity index 100%
rename from software/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch
rename to buildroot/package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch
diff --git a/software/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch b/buildroot/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
similarity index 100%
rename from software/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
rename to buildroot/package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
diff --git a/software/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch b/buildroot/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch
similarity index 100%
rename from software/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch
rename to buildroot/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch
diff --git a/software/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch b/buildroot/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch
similarity index 100%
rename from software/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch
rename to buildroot/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch
diff --git a/software/package/patch/Config.in b/buildroot/package/patch/Config.in
similarity index 100%
rename from software/package/patch/Config.in
rename to buildroot/package/patch/Config.in
diff --git a/software/package/patch/patch.hash b/buildroot/package/patch/patch.hash
similarity index 100%
rename from software/package/patch/patch.hash
rename to buildroot/package/patch/patch.hash
diff --git a/software/package/patch/patch.mk b/buildroot/package/patch/patch.mk
similarity index 100%
rename from software/package/patch/patch.mk
rename to buildroot/package/patch/patch.mk
diff --git a/software/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch b/buildroot/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch
similarity index 100%
rename from software/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch
rename to buildroot/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch
diff --git a/software/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch b/buildroot/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch
similarity index 100%
rename from software/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch
rename to buildroot/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch
diff --git a/software/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/buildroot/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch
similarity index 100%
rename from software/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch
rename to buildroot/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch
diff --git a/software/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch b/buildroot/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch
similarity index 100%
rename from software/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch
rename to buildroot/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch
diff --git a/software/package/patchelf/Config.in.host b/buildroot/package/patchelf/Config.in.host
similarity index 100%
rename from software/package/patchelf/Config.in.host
rename to buildroot/package/patchelf/Config.in.host
diff --git a/software/package/patchelf/patchelf.hash b/buildroot/package/patchelf/patchelf.hash
similarity index 100%
rename from software/package/patchelf/patchelf.hash
rename to buildroot/package/patchelf/patchelf.hash
diff --git a/software/package/patchelf/patchelf.mk b/buildroot/package/patchelf/patchelf.mk
similarity index 100%
rename from software/package/patchelf/patchelf.mk
rename to buildroot/package/patchelf/patchelf.mk
diff --git a/software/package/pax-utils/Config.in b/buildroot/package/pax-utils/Config.in
similarity index 100%
rename from software/package/pax-utils/Config.in
rename to buildroot/package/pax-utils/Config.in
diff --git a/software/package/pax-utils/pax-utils.hash b/buildroot/package/pax-utils/pax-utils.hash
similarity index 100%
rename from software/package/pax-utils/pax-utils.hash
rename to buildroot/package/pax-utils/pax-utils.hash
diff --git a/software/package/pax-utils/pax-utils.mk b/buildroot/package/pax-utils/pax-utils.mk
similarity index 100%
rename from software/package/pax-utils/pax-utils.mk
rename to buildroot/package/pax-utils/pax-utils.mk
diff --git a/software/package/paxtest/0001-genpaxtest-move-log-location.patch b/buildroot/package/paxtest/0001-genpaxtest-move-log-location.patch
similarity index 100%
rename from software/package/paxtest/0001-genpaxtest-move-log-location.patch
rename to buildroot/package/paxtest/0001-genpaxtest-move-log-location.patch
diff --git a/software/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch b/buildroot/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch
similarity index 100%
rename from software/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch
rename to buildroot/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch
diff --git a/software/package/paxtest/Config.in b/buildroot/package/paxtest/Config.in
similarity index 100%
rename from software/package/paxtest/Config.in
rename to buildroot/package/paxtest/Config.in
diff --git a/software/package/paxtest/paxtest.hash b/buildroot/package/paxtest/paxtest.hash
similarity index 100%
rename from software/package/paxtest/paxtest.hash
rename to buildroot/package/paxtest/paxtest.hash
diff --git a/software/package/paxtest/paxtest.mk b/buildroot/package/paxtest/paxtest.mk
similarity index 100%
rename from software/package/paxtest/paxtest.mk
rename to buildroot/package/paxtest/paxtest.mk
diff --git a/software/package/pciutils/Config.in b/buildroot/package/pciutils/Config.in
similarity index 100%
rename from software/package/pciutils/Config.in
rename to buildroot/package/pciutils/Config.in
diff --git a/software/package/pciutils/pciutils.hash b/buildroot/package/pciutils/pciutils.hash
similarity index 100%
rename from software/package/pciutils/pciutils.hash
rename to buildroot/package/pciutils/pciutils.hash
diff --git a/software/package/pciutils/pciutils.mk b/buildroot/package/pciutils/pciutils.mk
similarity index 100%
rename from software/package/pciutils/pciutils.mk
rename to buildroot/package/pciutils/pciutils.mk
diff --git a/software/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch b/buildroot/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
similarity index 100%
rename from software/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
rename to buildroot/package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
diff --git a/software/package/pcm-tools/Config.in b/buildroot/package/pcm-tools/Config.in
similarity index 100%
rename from software/package/pcm-tools/Config.in
rename to buildroot/package/pcm-tools/Config.in
diff --git a/software/package/pcm-tools/pcm-tools.hash b/buildroot/package/pcm-tools/pcm-tools.hash
similarity index 100%
rename from software/package/pcm-tools/pcm-tools.hash
rename to buildroot/package/pcm-tools/pcm-tools.hash
diff --git a/software/package/pcm-tools/pcm-tools.mk b/buildroot/package/pcm-tools/pcm-tools.mk
similarity index 100%
rename from software/package/pcm-tools/pcm-tools.mk
rename to buildroot/package/pcm-tools/pcm-tools.mk
diff --git a/software/package/pcmanfm/Config.in b/buildroot/package/pcmanfm/Config.in
similarity index 100%
rename from software/package/pcmanfm/Config.in
rename to buildroot/package/pcmanfm/Config.in
diff --git a/software/package/pcmanfm/pcmanfm.hash b/buildroot/package/pcmanfm/pcmanfm.hash
similarity index 100%
rename from software/package/pcmanfm/pcmanfm.hash
rename to buildroot/package/pcmanfm/pcmanfm.hash
diff --git a/software/package/pcmanfm/pcmanfm.mk b/buildroot/package/pcmanfm/pcmanfm.mk
similarity index 100%
rename from software/package/pcmanfm/pcmanfm.mk
rename to buildroot/package/pcmanfm/pcmanfm.mk
diff --git a/software/package/pcre/0001-Kill-compatibility-bits.patch b/buildroot/package/pcre/0001-Kill-compatibility-bits.patch
similarity index 100%
rename from software/package/pcre/0001-Kill-compatibility-bits.patch
rename to buildroot/package/pcre/0001-Kill-compatibility-bits.patch
diff --git a/software/package/pcre/0002-Disable-C-unit-tests.patch b/buildroot/package/pcre/0002-Disable-C-unit-tests.patch
similarity index 100%
rename from software/package/pcre/0002-Disable-C-unit-tests.patch
rename to buildroot/package/pcre/0002-Disable-C-unit-tests.patch
diff --git a/software/package/pcre/Config.in b/buildroot/package/pcre/Config.in
similarity index 100%
rename from software/package/pcre/Config.in
rename to buildroot/package/pcre/Config.in
diff --git a/software/package/pcre/pcre.hash b/buildroot/package/pcre/pcre.hash
similarity index 100%
rename from software/package/pcre/pcre.hash
rename to buildroot/package/pcre/pcre.hash
diff --git a/software/package/pcre/pcre.mk b/buildroot/package/pcre/pcre.mk
similarity index 100%
rename from software/package/pcre/pcre.mk
rename to buildroot/package/pcre/pcre.mk
diff --git a/software/package/pcre2/Config.in b/buildroot/package/pcre2/Config.in
similarity index 100%
rename from software/package/pcre2/Config.in
rename to buildroot/package/pcre2/Config.in
diff --git a/software/package/pcre2/pcre2.hash b/buildroot/package/pcre2/pcre2.hash
similarity index 100%
rename from software/package/pcre2/pcre2.hash
rename to buildroot/package/pcre2/pcre2.hash
diff --git a/software/package/pcre2/pcre2.mk b/buildroot/package/pcre2/pcre2.mk
similarity index 100%
rename from software/package/pcre2/pcre2.mk
rename to buildroot/package/pcre2/pcre2.mk
diff --git a/software/package/pcsc-lite/Config.in b/buildroot/package/pcsc-lite/Config.in
similarity index 100%
rename from software/package/pcsc-lite/Config.in
rename to buildroot/package/pcsc-lite/Config.in
diff --git a/software/package/pcsc-lite/pcsc-lite.hash b/buildroot/package/pcsc-lite/pcsc-lite.hash
similarity index 100%
rename from software/package/pcsc-lite/pcsc-lite.hash
rename to buildroot/package/pcsc-lite/pcsc-lite.hash
diff --git a/software/package/pcsc-lite/pcsc-lite.mk b/buildroot/package/pcsc-lite/pcsc-lite.mk
similarity index 100%
rename from software/package/pcsc-lite/pcsc-lite.mk
rename to buildroot/package/pcsc-lite/pcsc-lite.mk
diff --git a/software/package/pdbg/Config.in b/buildroot/package/pdbg/Config.in
similarity index 100%
rename from software/package/pdbg/Config.in
rename to buildroot/package/pdbg/Config.in
diff --git a/software/package/pdbg/pdbg.hash b/buildroot/package/pdbg/pdbg.hash
similarity index 100%
rename from software/package/pdbg/pdbg.hash
rename to buildroot/package/pdbg/pdbg.hash
diff --git a/software/package/pdbg/pdbg.mk b/buildroot/package/pdbg/pdbg.mk
similarity index 100%
rename from software/package/pdbg/pdbg.mk
rename to buildroot/package/pdbg/pdbg.mk
diff --git a/software/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch b/buildroot/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch
similarity index 100%
rename from software/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch
rename to buildroot/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch
diff --git a/software/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch b/buildroot/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch
similarity index 100%
rename from software/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch
rename to buildroot/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch
diff --git a/software/package/pdmenu/Config.in b/buildroot/package/pdmenu/Config.in
similarity index 100%
rename from software/package/pdmenu/Config.in
rename to buildroot/package/pdmenu/Config.in
diff --git a/software/package/pdmenu/pdmenu.hash b/buildroot/package/pdmenu/pdmenu.hash
similarity index 100%
rename from software/package/pdmenu/pdmenu.hash
rename to buildroot/package/pdmenu/pdmenu.hash
diff --git a/software/package/pdmenu/pdmenu.mk b/buildroot/package/pdmenu/pdmenu.mk
similarity index 100%
rename from software/package/pdmenu/pdmenu.mk
rename to buildroot/package/pdmenu/pdmenu.mk
diff --git a/software/package/perl-apache-logformat-compiler/Config.in b/buildroot/package/perl-apache-logformat-compiler/Config.in
similarity index 100%
rename from software/package/perl-apache-logformat-compiler/Config.in
rename to buildroot/package/perl-apache-logformat-compiler/Config.in
diff --git a/software/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash b/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash
similarity index 100%
rename from software/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash
rename to buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash
diff --git a/software/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk b/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk
similarity index 100%
rename from software/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk
rename to buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk
diff --git a/software/package/perl-appconfig/Config.in b/buildroot/package/perl-appconfig/Config.in
similarity index 100%
rename from software/package/perl-appconfig/Config.in
rename to buildroot/package/perl-appconfig/Config.in
diff --git a/software/package/perl-appconfig/perl-appconfig.hash b/buildroot/package/perl-appconfig/perl-appconfig.hash
similarity index 100%
rename from software/package/perl-appconfig/perl-appconfig.hash
rename to buildroot/package/perl-appconfig/perl-appconfig.hash
diff --git a/software/package/perl-appconfig/perl-appconfig.mk b/buildroot/package/perl-appconfig/perl-appconfig.mk
similarity index 100%
rename from software/package/perl-appconfig/perl-appconfig.mk
rename to buildroot/package/perl-appconfig/perl-appconfig.mk
diff --git a/software/package/perl-astro-suntime/Config.in b/buildroot/package/perl-astro-suntime/Config.in
similarity index 100%
rename from software/package/perl-astro-suntime/Config.in
rename to buildroot/package/perl-astro-suntime/Config.in
diff --git a/software/package/perl-astro-suntime/perl-astro-suntime.hash b/buildroot/package/perl-astro-suntime/perl-astro-suntime.hash
similarity index 100%
rename from software/package/perl-astro-suntime/perl-astro-suntime.hash
rename to buildroot/package/perl-astro-suntime/perl-astro-suntime.hash
diff --git a/software/package/perl-astro-suntime/perl-astro-suntime.mk b/buildroot/package/perl-astro-suntime/perl-astro-suntime.mk
similarity index 100%
rename from software/package/perl-astro-suntime/perl-astro-suntime.mk
rename to buildroot/package/perl-astro-suntime/perl-astro-suntime.mk
diff --git a/software/package/perl-class-inspector/Config.in b/buildroot/package/perl-class-inspector/Config.in
similarity index 100%
rename from software/package/perl-class-inspector/Config.in
rename to buildroot/package/perl-class-inspector/Config.in
diff --git a/software/package/perl-class-inspector/perl-class-inspector.hash b/buildroot/package/perl-class-inspector/perl-class-inspector.hash
similarity index 100%
rename from software/package/perl-class-inspector/perl-class-inspector.hash
rename to buildroot/package/perl-class-inspector/perl-class-inspector.hash
diff --git a/software/package/perl-class-inspector/perl-class-inspector.mk b/buildroot/package/perl-class-inspector/perl-class-inspector.mk
similarity index 100%
rename from software/package/perl-class-inspector/perl-class-inspector.mk
rename to buildroot/package/perl-class-inspector/perl-class-inspector.mk
diff --git a/software/package/perl-class-load/Config.in b/buildroot/package/perl-class-load/Config.in
similarity index 100%
rename from software/package/perl-class-load/Config.in
rename to buildroot/package/perl-class-load/Config.in
diff --git a/software/package/perl-class-load/perl-class-load.hash b/buildroot/package/perl-class-load/perl-class-load.hash
similarity index 100%
rename from software/package/perl-class-load/perl-class-load.hash
rename to buildroot/package/perl-class-load/perl-class-load.hash
diff --git a/software/package/perl-class-load/perl-class-load.mk b/buildroot/package/perl-class-load/perl-class-load.mk
similarity index 100%
rename from software/package/perl-class-load/perl-class-load.mk
rename to buildroot/package/perl-class-load/perl-class-load.mk
diff --git a/software/package/perl-class-method-modifiers/Config.in b/buildroot/package/perl-class-method-modifiers/Config.in
similarity index 100%
rename from software/package/perl-class-method-modifiers/Config.in
rename to buildroot/package/perl-class-method-modifiers/Config.in
diff --git a/software/package/perl-class-method-modifiers/perl-class-method-modifiers.hash b/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.hash
similarity index 100%
rename from software/package/perl-class-method-modifiers/perl-class-method-modifiers.hash
rename to buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.hash
diff --git a/software/package/perl-class-method-modifiers/perl-class-method-modifiers.mk b/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.mk
similarity index 100%
rename from software/package/perl-class-method-modifiers/perl-class-method-modifiers.mk
rename to buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.mk
diff --git a/software/package/perl-class-std-fast/Config.in b/buildroot/package/perl-class-std-fast/Config.in
similarity index 100%
rename from software/package/perl-class-std-fast/Config.in
rename to buildroot/package/perl-class-std-fast/Config.in
diff --git a/software/package/perl-class-std-fast/perl-class-std-fast.hash b/buildroot/package/perl-class-std-fast/perl-class-std-fast.hash
similarity index 100%
rename from software/package/perl-class-std-fast/perl-class-std-fast.hash
rename to buildroot/package/perl-class-std-fast/perl-class-std-fast.hash
diff --git a/software/package/perl-class-std-fast/perl-class-std-fast.mk b/buildroot/package/perl-class-std-fast/perl-class-std-fast.mk
similarity index 100%
rename from software/package/perl-class-std-fast/perl-class-std-fast.mk
rename to buildroot/package/perl-class-std-fast/perl-class-std-fast.mk
diff --git a/software/package/perl-class-std/Config.in b/buildroot/package/perl-class-std/Config.in
similarity index 100%
rename from software/package/perl-class-std/Config.in
rename to buildroot/package/perl-class-std/Config.in
diff --git a/software/package/perl-class-std/perl-class-std.hash b/buildroot/package/perl-class-std/perl-class-std.hash
similarity index 100%
rename from software/package/perl-class-std/perl-class-std.hash
rename to buildroot/package/perl-class-std/perl-class-std.hash
diff --git a/software/package/perl-class-std/perl-class-std.mk b/buildroot/package/perl-class-std/perl-class-std.mk
similarity index 100%
rename from software/package/perl-class-std/perl-class-std.mk
rename to buildroot/package/perl-class-std/perl-class-std.mk
diff --git a/software/package/perl-convert-asn1/Config.in b/buildroot/package/perl-convert-asn1/Config.in
similarity index 100%
rename from software/package/perl-convert-asn1/Config.in
rename to buildroot/package/perl-convert-asn1/Config.in
diff --git a/software/package/perl-convert-asn1/perl-convert-asn1.hash b/buildroot/package/perl-convert-asn1/perl-convert-asn1.hash
similarity index 100%
rename from software/package/perl-convert-asn1/perl-convert-asn1.hash
rename to buildroot/package/perl-convert-asn1/perl-convert-asn1.hash
diff --git a/software/package/perl-convert-asn1/perl-convert-asn1.mk b/buildroot/package/perl-convert-asn1/perl-convert-asn1.mk
similarity index 100%
rename from software/package/perl-convert-asn1/perl-convert-asn1.mk
rename to buildroot/package/perl-convert-asn1/perl-convert-asn1.mk
diff --git a/software/package/perl-cookie-baker/Config.in b/buildroot/package/perl-cookie-baker/Config.in
similarity index 100%
rename from software/package/perl-cookie-baker/Config.in
rename to buildroot/package/perl-cookie-baker/Config.in
diff --git a/software/package/perl-cookie-baker/perl-cookie-baker.hash b/buildroot/package/perl-cookie-baker/perl-cookie-baker.hash
similarity index 100%
rename from software/package/perl-cookie-baker/perl-cookie-baker.hash
rename to buildroot/package/perl-cookie-baker/perl-cookie-baker.hash
diff --git a/software/package/perl-cookie-baker/perl-cookie-baker.mk b/buildroot/package/perl-cookie-baker/perl-cookie-baker.mk
similarity index 100%
rename from software/package/perl-cookie-baker/perl-cookie-baker.mk
rename to buildroot/package/perl-cookie-baker/perl-cookie-baker.mk
diff --git a/software/package/perl-crypt-blowfish/Config.in b/buildroot/package/perl-crypt-blowfish/Config.in
similarity index 100%
rename from software/package/perl-crypt-blowfish/Config.in
rename to buildroot/package/perl-crypt-blowfish/Config.in
diff --git a/software/package/perl-crypt-blowfish/perl-crypt-blowfish.hash b/buildroot/package/perl-crypt-blowfish/perl-crypt-blowfish.hash
similarity index 100%
rename from software/package/perl-crypt-blowfish/perl-crypt-blowfish.hash
rename to buildroot/package/perl-crypt-blowfish/perl-crypt-blowfish.hash
diff --git a/software/package/perl-crypt-blowfish/perl-crypt-blowfish.mk b/buildroot/package/perl-crypt-blowfish/perl-crypt-blowfish.mk
similarity index 100%
rename from software/package/perl-crypt-blowfish/perl-crypt-blowfish.mk
rename to buildroot/package/perl-crypt-blowfish/perl-crypt-blowfish.mk
diff --git a/software/package/perl-crypt-cbc/Config.in b/buildroot/package/perl-crypt-cbc/Config.in
similarity index 100%
rename from software/package/perl-crypt-cbc/Config.in
rename to buildroot/package/perl-crypt-cbc/Config.in
diff --git a/software/package/perl-crypt-cbc/perl-crypt-cbc.hash b/buildroot/package/perl-crypt-cbc/perl-crypt-cbc.hash
similarity index 100%
rename from software/package/perl-crypt-cbc/perl-crypt-cbc.hash
rename to buildroot/package/perl-crypt-cbc/perl-crypt-cbc.hash
diff --git a/software/package/perl-crypt-cbc/perl-crypt-cbc.mk b/buildroot/package/perl-crypt-cbc/perl-crypt-cbc.mk
similarity index 100%
rename from software/package/perl-crypt-cbc/perl-crypt-cbc.mk
rename to buildroot/package/perl-crypt-cbc/perl-crypt-cbc.mk
diff --git a/software/package/perl-crypt-openssl-aes/Config.in b/buildroot/package/perl-crypt-openssl-aes/Config.in
similarity index 100%
rename from software/package/perl-crypt-openssl-aes/Config.in
rename to buildroot/package/perl-crypt-openssl-aes/Config.in
diff --git a/software/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash b/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash
similarity index 100%
rename from software/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash
rename to buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash
diff --git a/software/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk b/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk
similarity index 100%
rename from software/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk
rename to buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk
diff --git a/software/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash b/buildroot/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash
similarity index 100%
rename from software/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash
rename to buildroot/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash
diff --git a/software/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk b/buildroot/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk
similarity index 100%
rename from software/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk
rename to buildroot/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk
diff --git a/software/package/perl-crypt-openssl-random/Config.in b/buildroot/package/perl-crypt-openssl-random/Config.in
similarity index 100%
rename from software/package/perl-crypt-openssl-random/Config.in
rename to buildroot/package/perl-crypt-openssl-random/Config.in
diff --git a/software/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash b/buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash
similarity index 100%
rename from software/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash
rename to buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash
diff --git a/software/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk b/buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
similarity index 100%
rename from software/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
rename to buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
diff --git a/software/package/perl-crypt-openssl-rsa/Config.in b/buildroot/package/perl-crypt-openssl-rsa/Config.in
similarity index 100%
rename from software/package/perl-crypt-openssl-rsa/Config.in
rename to buildroot/package/perl-crypt-openssl-rsa/Config.in
diff --git a/software/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash b/buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash
similarity index 100%
rename from software/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash
rename to buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash
diff --git a/software/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
similarity index 100%
rename from software/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
rename to buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
diff --git a/software/package/perl-data-dump/Config.in b/buildroot/package/perl-data-dump/Config.in
similarity index 100%
rename from software/package/perl-data-dump/Config.in
rename to buildroot/package/perl-data-dump/Config.in
diff --git a/software/package/perl-data-dump/perl-data-dump.hash b/buildroot/package/perl-data-dump/perl-data-dump.hash
similarity index 100%
rename from software/package/perl-data-dump/perl-data-dump.hash
rename to buildroot/package/perl-data-dump/perl-data-dump.hash
diff --git a/software/package/perl-data-dump/perl-data-dump.mk b/buildroot/package/perl-data-dump/perl-data-dump.mk
similarity index 100%
rename from software/package/perl-data-dump/perl-data-dump.mk
rename to buildroot/package/perl-data-dump/perl-data-dump.mk
diff --git a/software/package/perl-data-optlist/Config.in b/buildroot/package/perl-data-optlist/Config.in
similarity index 100%
rename from software/package/perl-data-optlist/Config.in
rename to buildroot/package/perl-data-optlist/Config.in
diff --git a/software/package/perl-data-optlist/perl-data-optlist.hash b/buildroot/package/perl-data-optlist/perl-data-optlist.hash
similarity index 100%
rename from software/package/perl-data-optlist/perl-data-optlist.hash
rename to buildroot/package/perl-data-optlist/perl-data-optlist.hash
diff --git a/software/package/perl-data-optlist/perl-data-optlist.mk b/buildroot/package/perl-data-optlist/perl-data-optlist.mk
similarity index 100%
rename from software/package/perl-data-optlist/perl-data-optlist.mk
rename to buildroot/package/perl-data-optlist/perl-data-optlist.mk
diff --git a/software/package/perl-data-uuid/Config.in b/buildroot/package/perl-data-uuid/Config.in
similarity index 100%
rename from software/package/perl-data-uuid/Config.in
rename to buildroot/package/perl-data-uuid/Config.in
diff --git a/software/package/perl-data-uuid/perl-data-uuid.hash b/buildroot/package/perl-data-uuid/perl-data-uuid.hash
similarity index 100%
rename from software/package/perl-data-uuid/perl-data-uuid.hash
rename to buildroot/package/perl-data-uuid/perl-data-uuid.hash
diff --git a/software/package/perl-data-uuid/perl-data-uuid.mk b/buildroot/package/perl-data-uuid/perl-data-uuid.mk
similarity index 100%
rename from software/package/perl-data-uuid/perl-data-uuid.mk
rename to buildroot/package/perl-data-uuid/perl-data-uuid.mk
diff --git a/software/package/perl-date-manip/Config.in b/buildroot/package/perl-date-manip/Config.in
similarity index 100%
rename from software/package/perl-date-manip/Config.in
rename to buildroot/package/perl-date-manip/Config.in
diff --git a/software/package/perl-date-manip/perl-date-manip.hash b/buildroot/package/perl-date-manip/perl-date-manip.hash
similarity index 100%
rename from software/package/perl-date-manip/perl-date-manip.hash
rename to buildroot/package/perl-date-manip/perl-date-manip.hash
diff --git a/software/package/perl-date-manip/perl-date-manip.mk b/buildroot/package/perl-date-manip/perl-date-manip.mk
similarity index 100%
rename from software/package/perl-date-manip/perl-date-manip.mk
rename to buildroot/package/perl-date-manip/perl-date-manip.mk
diff --git a/software/package/perl-datetime-tiny/Config.in b/buildroot/package/perl-datetime-tiny/Config.in
similarity index 100%
rename from software/package/perl-datetime-tiny/Config.in
rename to buildroot/package/perl-datetime-tiny/Config.in
diff --git a/software/package/perl-datetime-tiny/perl-datetime-tiny.hash b/buildroot/package/perl-datetime-tiny/perl-datetime-tiny.hash
similarity index 100%
rename from software/package/perl-datetime-tiny/perl-datetime-tiny.hash
rename to buildroot/package/perl-datetime-tiny/perl-datetime-tiny.hash
diff --git a/software/package/perl-datetime-tiny/perl-datetime-tiny.mk b/buildroot/package/perl-datetime-tiny/perl-datetime-tiny.mk
similarity index 100%
rename from software/package/perl-datetime-tiny/perl-datetime-tiny.mk
rename to buildroot/package/perl-datetime-tiny/perl-datetime-tiny.mk
diff --git a/software/package/perl-dbd-mysql/Config.in b/buildroot/package/perl-dbd-mysql/Config.in
similarity index 100%
rename from software/package/perl-dbd-mysql/Config.in
rename to buildroot/package/perl-dbd-mysql/Config.in
diff --git a/software/package/perl-dbd-mysql/perl-dbd-mysql.hash b/buildroot/package/perl-dbd-mysql/perl-dbd-mysql.hash
similarity index 100%
rename from software/package/perl-dbd-mysql/perl-dbd-mysql.hash
rename to buildroot/package/perl-dbd-mysql/perl-dbd-mysql.hash
diff --git a/software/package/perl-dbd-mysql/perl-dbd-mysql.mk b/buildroot/package/perl-dbd-mysql/perl-dbd-mysql.mk
similarity index 100%
rename from software/package/perl-dbd-mysql/perl-dbd-mysql.mk
rename to buildroot/package/perl-dbd-mysql/perl-dbd-mysql.mk
diff --git a/software/package/perl-dbi/Config.in b/buildroot/package/perl-dbi/Config.in
similarity index 100%
rename from software/package/perl-dbi/Config.in
rename to buildroot/package/perl-dbi/Config.in
diff --git a/software/package/perl-dbi/perl-dbi.hash b/buildroot/package/perl-dbi/perl-dbi.hash
similarity index 100%
rename from software/package/perl-dbi/perl-dbi.hash
rename to buildroot/package/perl-dbi/perl-dbi.hash
diff --git a/software/package/perl-dbi/perl-dbi.mk b/buildroot/package/perl-dbi/perl-dbi.mk
similarity index 100%
rename from software/package/perl-dbi/perl-dbi.mk
rename to buildroot/package/perl-dbi/perl-dbi.mk
diff --git a/software/package/perl-devel-globaldestruction/Config.in b/buildroot/package/perl-devel-globaldestruction/Config.in
similarity index 100%
rename from software/package/perl-devel-globaldestruction/Config.in
rename to buildroot/package/perl-devel-globaldestruction/Config.in
diff --git a/software/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash b/buildroot/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash
similarity index 100%
rename from software/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash
rename to buildroot/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash
diff --git a/software/package/perl-devel-globaldestruction/perl-devel-globaldestruction.mk b/buildroot/package/perl-devel-globaldestruction/perl-devel-globaldestruction.mk
similarity index 100%
rename from software/package/perl-devel-globaldestruction/perl-devel-globaldestruction.mk
rename to buildroot/package/perl-devel-globaldestruction/perl-devel-globaldestruction.mk
diff --git a/software/package/perl-devel-stacktrace-ashtml/Config.in b/buildroot/package/perl-devel-stacktrace-ashtml/Config.in
similarity index 100%
rename from software/package/perl-devel-stacktrace-ashtml/Config.in
rename to buildroot/package/perl-devel-stacktrace-ashtml/Config.in
diff --git a/software/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash b/buildroot/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash
similarity index 100%
rename from software/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash
rename to buildroot/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash
diff --git a/software/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.mk b/buildroot/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.mk
similarity index 100%
rename from software/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.mk
rename to buildroot/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.mk
diff --git a/software/package/perl-devel-stacktrace/Config.in b/buildroot/package/perl-devel-stacktrace/Config.in
similarity index 100%
rename from software/package/perl-devel-stacktrace/Config.in
rename to buildroot/package/perl-devel-stacktrace/Config.in
diff --git a/software/package/perl-devel-stacktrace/perl-devel-stacktrace.hash b/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.hash
similarity index 100%
rename from software/package/perl-devel-stacktrace/perl-devel-stacktrace.hash
rename to buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.hash
diff --git a/software/package/perl-devel-stacktrace/perl-devel-stacktrace.mk b/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.mk
similarity index 100%
rename from software/package/perl-devel-stacktrace/perl-devel-stacktrace.mk
rename to buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.mk
diff --git a/software/package/perl-device-serialport/Config.in b/buildroot/package/perl-device-serialport/Config.in
similarity index 100%
rename from software/package/perl-device-serialport/Config.in
rename to buildroot/package/perl-device-serialport/Config.in
diff --git a/software/package/perl-device-serialport/perl-device-serialport.hash b/buildroot/package/perl-device-serialport/perl-device-serialport.hash
similarity index 100%
rename from software/package/perl-device-serialport/perl-device-serialport.hash
rename to buildroot/package/perl-device-serialport/perl-device-serialport.hash
diff --git a/software/package/perl-device-serialport/perl-device-serialport.mk b/buildroot/package/perl-device-serialport/perl-device-serialport.mk
similarity index 100%
rename from software/package/perl-device-serialport/perl-device-serialport.mk
rename to buildroot/package/perl-device-serialport/perl-device-serialport.mk
diff --git a/software/package/perl-digest-hmac/Config.in b/buildroot/package/perl-digest-hmac/Config.in
similarity index 100%
rename from software/package/perl-digest-hmac/Config.in
rename to buildroot/package/perl-digest-hmac/Config.in
diff --git a/software/package/perl-digest-hmac/perl-digest-hmac.hash b/buildroot/package/perl-digest-hmac/perl-digest-hmac.hash
similarity index 100%
rename from software/package/perl-digest-hmac/perl-digest-hmac.hash
rename to buildroot/package/perl-digest-hmac/perl-digest-hmac.hash
diff --git a/software/package/perl-digest-hmac/perl-digest-hmac.mk b/buildroot/package/perl-digest-hmac/perl-digest-hmac.mk
similarity index 100%
rename from software/package/perl-digest-hmac/perl-digest-hmac.mk
rename to buildroot/package/perl-digest-hmac/perl-digest-hmac.mk
diff --git a/software/package/perl-digest-sha1/Config.in b/buildroot/package/perl-digest-sha1/Config.in
similarity index 100%
rename from software/package/perl-digest-sha1/Config.in
rename to buildroot/package/perl-digest-sha1/Config.in
diff --git a/software/package/perl-digest-sha1/perl-digest-sha1.hash b/buildroot/package/perl-digest-sha1/perl-digest-sha1.hash
similarity index 100%
rename from software/package/perl-digest-sha1/perl-digest-sha1.hash
rename to buildroot/package/perl-digest-sha1/perl-digest-sha1.hash
diff --git a/software/package/perl-digest-sha1/perl-digest-sha1.mk b/buildroot/package/perl-digest-sha1/perl-digest-sha1.mk
similarity index 100%
rename from software/package/perl-digest-sha1/perl-digest-sha1.mk
rename to buildroot/package/perl-digest-sha1/perl-digest-sha1.mk
diff --git a/software/package/perl-dist-checkconflicts/Config.in b/buildroot/package/perl-dist-checkconflicts/Config.in
similarity index 100%
rename from software/package/perl-dist-checkconflicts/Config.in
rename to buildroot/package/perl-dist-checkconflicts/Config.in
diff --git a/software/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash b/buildroot/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash
similarity index 100%
rename from software/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash
rename to buildroot/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash
diff --git a/software/package/perl-dist-checkconflicts/perl-dist-checkconflicts.mk b/buildroot/package/perl-dist-checkconflicts/perl-dist-checkconflicts.mk
similarity index 100%
rename from software/package/perl-dist-checkconflicts/perl-dist-checkconflicts.mk
rename to buildroot/package/perl-dist-checkconflicts/perl-dist-checkconflicts.mk
diff --git a/software/package/perl-encode-detect/Config.in b/buildroot/package/perl-encode-detect/Config.in
similarity index 100%
rename from software/package/perl-encode-detect/Config.in
rename to buildroot/package/perl-encode-detect/Config.in
diff --git a/software/package/perl-encode-detect/perl-encode-detect.hash b/buildroot/package/perl-encode-detect/perl-encode-detect.hash
similarity index 100%
rename from software/package/perl-encode-detect/perl-encode-detect.hash
rename to buildroot/package/perl-encode-detect/perl-encode-detect.hash
diff --git a/software/package/perl-encode-detect/perl-encode-detect.mk b/buildroot/package/perl-encode-detect/perl-encode-detect.mk
similarity index 100%
rename from software/package/perl-encode-detect/perl-encode-detect.mk
rename to buildroot/package/perl-encode-detect/perl-encode-detect.mk
diff --git a/software/package/perl-encode-locale/Config.in b/buildroot/package/perl-encode-locale/Config.in
similarity index 100%
rename from software/package/perl-encode-locale/Config.in
rename to buildroot/package/perl-encode-locale/Config.in
diff --git a/software/package/perl-encode-locale/perl-encode-locale.hash b/buildroot/package/perl-encode-locale/perl-encode-locale.hash
similarity index 100%
rename from software/package/perl-encode-locale/perl-encode-locale.hash
rename to buildroot/package/perl-encode-locale/perl-encode-locale.hash
diff --git a/software/package/perl-encode-locale/perl-encode-locale.mk b/buildroot/package/perl-encode-locale/perl-encode-locale.mk
similarity index 100%
rename from software/package/perl-encode-locale/perl-encode-locale.mk
rename to buildroot/package/perl-encode-locale/perl-encode-locale.mk
diff --git a/software/package/perl-exporter-tiny/Config.in b/buildroot/package/perl-exporter-tiny/Config.in
similarity index 100%
rename from software/package/perl-exporter-tiny/Config.in
rename to buildroot/package/perl-exporter-tiny/Config.in
diff --git a/software/package/perl-exporter-tiny/perl-exporter-tiny.hash b/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.hash
similarity index 100%
rename from software/package/perl-exporter-tiny/perl-exporter-tiny.hash
rename to buildroot/package/perl-exporter-tiny/perl-exporter-tiny.hash
diff --git a/software/package/perl-exporter-tiny/perl-exporter-tiny.mk b/buildroot/package/perl-exporter-tiny/perl-exporter-tiny.mk
similarity index 100%
rename from software/package/perl-exporter-tiny/perl-exporter-tiny.mk
rename to buildroot/package/perl-exporter-tiny/perl-exporter-tiny.mk
diff --git a/software/package/perl-extutils-config/perl-extutils-config.hash b/buildroot/package/perl-extutils-config/perl-extutils-config.hash
similarity index 100%
rename from software/package/perl-extutils-config/perl-extutils-config.hash
rename to buildroot/package/perl-extutils-config/perl-extutils-config.hash
diff --git a/software/package/perl-extutils-config/perl-extutils-config.mk b/buildroot/package/perl-extutils-config/perl-extutils-config.mk
similarity index 100%
rename from software/package/perl-extutils-config/perl-extutils-config.mk
rename to buildroot/package/perl-extutils-config/perl-extutils-config.mk
diff --git a/software/package/perl-extutils-helpers/perl-extutils-helpers.hash b/buildroot/package/perl-extutils-helpers/perl-extutils-helpers.hash
similarity index 100%
rename from software/package/perl-extutils-helpers/perl-extutils-helpers.hash
rename to buildroot/package/perl-extutils-helpers/perl-extutils-helpers.hash
diff --git a/software/package/perl-extutils-helpers/perl-extutils-helpers.mk b/buildroot/package/perl-extutils-helpers/perl-extutils-helpers.mk
similarity index 100%
rename from software/package/perl-extutils-helpers/perl-extutils-helpers.mk
rename to buildroot/package/perl-extutils-helpers/perl-extutils-helpers.mk
diff --git a/software/package/perl-extutils-installpaths/perl-extutils-installpaths.hash b/buildroot/package/perl-extutils-installpaths/perl-extutils-installpaths.hash
similarity index 100%
rename from software/package/perl-extutils-installpaths/perl-extutils-installpaths.hash
rename to buildroot/package/perl-extutils-installpaths/perl-extutils-installpaths.hash
diff --git a/software/package/perl-extutils-installpaths/perl-extutils-installpaths.mk b/buildroot/package/perl-extutils-installpaths/perl-extutils-installpaths.mk
similarity index 100%
rename from software/package/perl-extutils-installpaths/perl-extutils-installpaths.mk
rename to buildroot/package/perl-extutils-installpaths/perl-extutils-installpaths.mk
diff --git a/software/package/perl-file-listing/Config.in b/buildroot/package/perl-file-listing/Config.in
similarity index 100%
rename from software/package/perl-file-listing/Config.in
rename to buildroot/package/perl-file-listing/Config.in
diff --git a/software/package/perl-file-listing/perl-file-listing.hash b/buildroot/package/perl-file-listing/perl-file-listing.hash
similarity index 100%
rename from software/package/perl-file-listing/perl-file-listing.hash
rename to buildroot/package/perl-file-listing/perl-file-listing.hash
diff --git a/software/package/perl-file-listing/perl-file-listing.mk b/buildroot/package/perl-file-listing/perl-file-listing.mk
similarity index 100%
rename from software/package/perl-file-listing/perl-file-listing.mk
rename to buildroot/package/perl-file-listing/perl-file-listing.mk
diff --git a/software/package/perl-file-sharedir-install/perl-file-sharedir-install.hash b/buildroot/package/perl-file-sharedir-install/perl-file-sharedir-install.hash
similarity index 100%
rename from software/package/perl-file-sharedir-install/perl-file-sharedir-install.hash
rename to buildroot/package/perl-file-sharedir-install/perl-file-sharedir-install.hash
diff --git a/software/package/perl-file-sharedir-install/perl-file-sharedir-install.mk b/buildroot/package/perl-file-sharedir-install/perl-file-sharedir-install.mk
similarity index 100%
rename from software/package/perl-file-sharedir-install/perl-file-sharedir-install.mk
rename to buildroot/package/perl-file-sharedir-install/perl-file-sharedir-install.mk
diff --git a/software/package/perl-file-sharedir/Config.in b/buildroot/package/perl-file-sharedir/Config.in
similarity index 100%
rename from software/package/perl-file-sharedir/Config.in
rename to buildroot/package/perl-file-sharedir/Config.in
diff --git a/software/package/perl-file-sharedir/perl-file-sharedir.hash b/buildroot/package/perl-file-sharedir/perl-file-sharedir.hash
similarity index 100%
rename from software/package/perl-file-sharedir/perl-file-sharedir.hash
rename to buildroot/package/perl-file-sharedir/perl-file-sharedir.hash
diff --git a/software/package/perl-file-sharedir/perl-file-sharedir.mk b/buildroot/package/perl-file-sharedir/perl-file-sharedir.mk
similarity index 100%
rename from software/package/perl-file-sharedir/perl-file-sharedir.mk
rename to buildroot/package/perl-file-sharedir/perl-file-sharedir.mk
diff --git a/software/package/perl-file-slurp/Config.in b/buildroot/package/perl-file-slurp/Config.in
similarity index 100%
rename from software/package/perl-file-slurp/Config.in
rename to buildroot/package/perl-file-slurp/Config.in
diff --git a/software/package/perl-file-slurp/perl-file-slurp.hash b/buildroot/package/perl-file-slurp/perl-file-slurp.hash
similarity index 100%
rename from software/package/perl-file-slurp/perl-file-slurp.hash
rename to buildroot/package/perl-file-slurp/perl-file-slurp.hash
diff --git a/software/package/perl-file-slurp/perl-file-slurp.mk b/buildroot/package/perl-file-slurp/perl-file-slurp.mk
similarity index 100%
rename from software/package/perl-file-slurp/perl-file-slurp.mk
rename to buildroot/package/perl-file-slurp/perl-file-slurp.mk
diff --git a/software/package/perl-file-util/Config.in b/buildroot/package/perl-file-util/Config.in
similarity index 100%
rename from software/package/perl-file-util/Config.in
rename to buildroot/package/perl-file-util/Config.in
diff --git a/software/package/perl-file-util/perl-file-util.hash b/buildroot/package/perl-file-util/perl-file-util.hash
similarity index 100%
rename from software/package/perl-file-util/perl-file-util.hash
rename to buildroot/package/perl-file-util/perl-file-util.hash
diff --git a/software/package/perl-file-util/perl-file-util.mk b/buildroot/package/perl-file-util/perl-file-util.mk
similarity index 100%
rename from software/package/perl-file-util/perl-file-util.mk
rename to buildroot/package/perl-file-util/perl-file-util.mk
diff --git a/software/package/perl-filesys-notify-simple/Config.in b/buildroot/package/perl-filesys-notify-simple/Config.in
similarity index 100%
rename from software/package/perl-filesys-notify-simple/Config.in
rename to buildroot/package/perl-filesys-notify-simple/Config.in
diff --git a/software/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash b/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash
similarity index 100%
rename from software/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash
rename to buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash
diff --git a/software/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk b/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk
similarity index 100%
rename from software/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk
rename to buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk
diff --git a/software/package/perl-gd/Config.in b/buildroot/package/perl-gd/Config.in
similarity index 100%
rename from software/package/perl-gd/Config.in
rename to buildroot/package/perl-gd/Config.in
diff --git a/software/package/perl-gd/perl-gd.hash b/buildroot/package/perl-gd/perl-gd.hash
similarity index 100%
rename from software/package/perl-gd/perl-gd.hash
rename to buildroot/package/perl-gd/perl-gd.hash
diff --git a/software/package/perl-gd/perl-gd.mk b/buildroot/package/perl-gd/perl-gd.mk
similarity index 100%
rename from software/package/perl-gd/perl-gd.mk
rename to buildroot/package/perl-gd/perl-gd.mk
diff --git a/software/package/perl-gdgraph/Config.in b/buildroot/package/perl-gdgraph/Config.in
similarity index 100%
rename from software/package/perl-gdgraph/Config.in
rename to buildroot/package/perl-gdgraph/Config.in
diff --git a/software/package/perl-gdgraph/perl-gdgraph.hash b/buildroot/package/perl-gdgraph/perl-gdgraph.hash
similarity index 100%
rename from software/package/perl-gdgraph/perl-gdgraph.hash
rename to buildroot/package/perl-gdgraph/perl-gdgraph.hash
diff --git a/software/package/perl-gdgraph/perl-gdgraph.mk b/buildroot/package/perl-gdgraph/perl-gdgraph.mk
similarity index 100%
rename from software/package/perl-gdgraph/perl-gdgraph.mk
rename to buildroot/package/perl-gdgraph/perl-gdgraph.mk
diff --git a/software/package/perl-gdtextutil/Config.in b/buildroot/package/perl-gdtextutil/Config.in
similarity index 100%
rename from software/package/perl-gdtextutil/Config.in
rename to buildroot/package/perl-gdtextutil/Config.in
diff --git a/software/package/perl-gdtextutil/perl-gdtextutil.hash b/buildroot/package/perl-gdtextutil/perl-gdtextutil.hash
similarity index 100%
rename from software/package/perl-gdtextutil/perl-gdtextutil.hash
rename to buildroot/package/perl-gdtextutil/perl-gdtextutil.hash
diff --git a/software/package/perl-gdtextutil/perl-gdtextutil.mk b/buildroot/package/perl-gdtextutil/perl-gdtextutil.mk
similarity index 100%
rename from software/package/perl-gdtextutil/perl-gdtextutil.mk
rename to buildroot/package/perl-gdtextutil/perl-gdtextutil.mk
diff --git a/software/package/perl-hash-multivalue/Config.in b/buildroot/package/perl-hash-multivalue/Config.in
similarity index 100%
rename from software/package/perl-hash-multivalue/Config.in
rename to buildroot/package/perl-hash-multivalue/Config.in
diff --git a/software/package/perl-hash-multivalue/perl-hash-multivalue.hash b/buildroot/package/perl-hash-multivalue/perl-hash-multivalue.hash
similarity index 100%
rename from software/package/perl-hash-multivalue/perl-hash-multivalue.hash
rename to buildroot/package/perl-hash-multivalue/perl-hash-multivalue.hash
diff --git a/software/package/perl-hash-multivalue/perl-hash-multivalue.mk b/buildroot/package/perl-hash-multivalue/perl-hash-multivalue.mk
similarity index 100%
rename from software/package/perl-hash-multivalue/perl-hash-multivalue.mk
rename to buildroot/package/perl-hash-multivalue/perl-hash-multivalue.mk
diff --git a/software/package/perl-html-parser/Config.in b/buildroot/package/perl-html-parser/Config.in
similarity index 100%
rename from software/package/perl-html-parser/Config.in
rename to buildroot/package/perl-html-parser/Config.in
diff --git a/software/package/perl-html-parser/perl-html-parser.hash b/buildroot/package/perl-html-parser/perl-html-parser.hash
similarity index 100%
rename from software/package/perl-html-parser/perl-html-parser.hash
rename to buildroot/package/perl-html-parser/perl-html-parser.hash
diff --git a/software/package/perl-html-parser/perl-html-parser.mk b/buildroot/package/perl-html-parser/perl-html-parser.mk
similarity index 100%
rename from software/package/perl-html-parser/perl-html-parser.mk
rename to buildroot/package/perl-html-parser/perl-html-parser.mk
diff --git a/software/package/perl-html-tagset/Config.in b/buildroot/package/perl-html-tagset/Config.in
similarity index 100%
rename from software/package/perl-html-tagset/Config.in
rename to buildroot/package/perl-html-tagset/Config.in
diff --git a/software/package/perl-html-tagset/perl-html-tagset.hash b/buildroot/package/perl-html-tagset/perl-html-tagset.hash
similarity index 100%
rename from software/package/perl-html-tagset/perl-html-tagset.hash
rename to buildroot/package/perl-html-tagset/perl-html-tagset.hash
diff --git a/software/package/perl-html-tagset/perl-html-tagset.mk b/buildroot/package/perl-html-tagset/perl-html-tagset.mk
similarity index 100%
rename from software/package/perl-html-tagset/perl-html-tagset.mk
rename to buildroot/package/perl-html-tagset/perl-html-tagset.mk
diff --git a/software/package/perl-http-cookies/Config.in b/buildroot/package/perl-http-cookies/Config.in
similarity index 100%
rename from software/package/perl-http-cookies/Config.in
rename to buildroot/package/perl-http-cookies/Config.in
diff --git a/software/package/perl-http-cookies/perl-http-cookies.hash b/buildroot/package/perl-http-cookies/perl-http-cookies.hash
similarity index 100%
rename from software/package/perl-http-cookies/perl-http-cookies.hash
rename to buildroot/package/perl-http-cookies/perl-http-cookies.hash
diff --git a/software/package/perl-http-cookies/perl-http-cookies.mk b/buildroot/package/perl-http-cookies/perl-http-cookies.mk
similarity index 100%
rename from software/package/perl-http-cookies/perl-http-cookies.mk
rename to buildroot/package/perl-http-cookies/perl-http-cookies.mk
diff --git a/software/package/perl-http-daemon/Config.in b/buildroot/package/perl-http-daemon/Config.in
similarity index 100%
rename from software/package/perl-http-daemon/Config.in
rename to buildroot/package/perl-http-daemon/Config.in
diff --git a/software/package/perl-http-daemon/perl-http-daemon.hash b/buildroot/package/perl-http-daemon/perl-http-daemon.hash
similarity index 100%
rename from software/package/perl-http-daemon/perl-http-daemon.hash
rename to buildroot/package/perl-http-daemon/perl-http-daemon.hash
diff --git a/software/package/perl-http-daemon/perl-http-daemon.mk b/buildroot/package/perl-http-daemon/perl-http-daemon.mk
similarity index 100%
rename from software/package/perl-http-daemon/perl-http-daemon.mk
rename to buildroot/package/perl-http-daemon/perl-http-daemon.mk
diff --git a/software/package/perl-http-date/Config.in b/buildroot/package/perl-http-date/Config.in
similarity index 100%
rename from software/package/perl-http-date/Config.in
rename to buildroot/package/perl-http-date/Config.in
diff --git a/software/package/perl-http-date/perl-http-date.hash b/buildroot/package/perl-http-date/perl-http-date.hash
similarity index 100%
rename from software/package/perl-http-date/perl-http-date.hash
rename to buildroot/package/perl-http-date/perl-http-date.hash
diff --git a/software/package/perl-http-date/perl-http-date.mk b/buildroot/package/perl-http-date/perl-http-date.mk
similarity index 100%
rename from software/package/perl-http-date/perl-http-date.mk
rename to buildroot/package/perl-http-date/perl-http-date.mk
diff --git a/software/package/perl-http-entity-parser/Config.in b/buildroot/package/perl-http-entity-parser/Config.in
similarity index 100%
rename from software/package/perl-http-entity-parser/Config.in
rename to buildroot/package/perl-http-entity-parser/Config.in
diff --git a/software/package/perl-http-entity-parser/perl-http-entity-parser.hash b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash
similarity index 100%
rename from software/package/perl-http-entity-parser/perl-http-entity-parser.hash
rename to buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash
diff --git a/software/package/perl-http-entity-parser/perl-http-entity-parser.mk b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk
similarity index 100%
rename from software/package/perl-http-entity-parser/perl-http-entity-parser.mk
rename to buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk
diff --git a/software/package/perl-http-headers-fast/Config.in b/buildroot/package/perl-http-headers-fast/Config.in
similarity index 100%
rename from software/package/perl-http-headers-fast/Config.in
rename to buildroot/package/perl-http-headers-fast/Config.in
diff --git a/software/package/perl-http-headers-fast/perl-http-headers-fast.hash b/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.hash
similarity index 100%
rename from software/package/perl-http-headers-fast/perl-http-headers-fast.hash
rename to buildroot/package/perl-http-headers-fast/perl-http-headers-fast.hash
diff --git a/software/package/perl-http-headers-fast/perl-http-headers-fast.mk b/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.mk
similarity index 100%
rename from software/package/perl-http-headers-fast/perl-http-headers-fast.mk
rename to buildroot/package/perl-http-headers-fast/perl-http-headers-fast.mk
diff --git a/software/package/perl-http-message/Config.in b/buildroot/package/perl-http-message/Config.in
similarity index 100%
rename from software/package/perl-http-message/Config.in
rename to buildroot/package/perl-http-message/Config.in
diff --git a/software/package/perl-http-message/perl-http-message.hash b/buildroot/package/perl-http-message/perl-http-message.hash
similarity index 100%
rename from software/package/perl-http-message/perl-http-message.hash
rename to buildroot/package/perl-http-message/perl-http-message.hash
diff --git a/software/package/perl-http-message/perl-http-message.mk b/buildroot/package/perl-http-message/perl-http-message.mk
similarity index 100%
rename from software/package/perl-http-message/perl-http-message.mk
rename to buildroot/package/perl-http-message/perl-http-message.mk
diff --git a/software/package/perl-http-multipartparser/Config.in b/buildroot/package/perl-http-multipartparser/Config.in
similarity index 100%
rename from software/package/perl-http-multipartparser/Config.in
rename to buildroot/package/perl-http-multipartparser/Config.in
diff --git a/software/package/perl-http-multipartparser/perl-http-multipartparser.hash b/buildroot/package/perl-http-multipartparser/perl-http-multipartparser.hash
similarity index 100%
rename from software/package/perl-http-multipartparser/perl-http-multipartparser.hash
rename to buildroot/package/perl-http-multipartparser/perl-http-multipartparser.hash
diff --git a/software/package/perl-http-multipartparser/perl-http-multipartparser.mk b/buildroot/package/perl-http-multipartparser/perl-http-multipartparser.mk
similarity index 100%
rename from software/package/perl-http-multipartparser/perl-http-multipartparser.mk
rename to buildroot/package/perl-http-multipartparser/perl-http-multipartparser.mk
diff --git a/software/package/perl-http-negotiate/Config.in b/buildroot/package/perl-http-negotiate/Config.in
similarity index 100%
rename from software/package/perl-http-negotiate/Config.in
rename to buildroot/package/perl-http-negotiate/Config.in
diff --git a/software/package/perl-http-negotiate/perl-http-negotiate.hash b/buildroot/package/perl-http-negotiate/perl-http-negotiate.hash
similarity index 100%
rename from software/package/perl-http-negotiate/perl-http-negotiate.hash
rename to buildroot/package/perl-http-negotiate/perl-http-negotiate.hash
diff --git a/software/package/perl-http-negotiate/perl-http-negotiate.mk b/buildroot/package/perl-http-negotiate/perl-http-negotiate.mk
similarity index 100%
rename from software/package/perl-http-negotiate/perl-http-negotiate.mk
rename to buildroot/package/perl-http-negotiate/perl-http-negotiate.mk
diff --git a/software/package/perl-io-html/Config.in b/buildroot/package/perl-io-html/Config.in
similarity index 100%
rename from software/package/perl-io-html/Config.in
rename to buildroot/package/perl-io-html/Config.in
diff --git a/software/package/perl-io-html/perl-io-html.hash b/buildroot/package/perl-io-html/perl-io-html.hash
similarity index 100%
rename from software/package/perl-io-html/perl-io-html.hash
rename to buildroot/package/perl-io-html/perl-io-html.hash
diff --git a/software/package/perl-io-html/perl-io-html.mk b/buildroot/package/perl-io-html/perl-io-html.mk
similarity index 100%
rename from software/package/perl-io-html/perl-io-html.mk
rename to buildroot/package/perl-io-html/perl-io-html.mk
diff --git a/software/package/perl-io-interface/Config.in b/buildroot/package/perl-io-interface/Config.in
similarity index 100%
rename from software/package/perl-io-interface/Config.in
rename to buildroot/package/perl-io-interface/Config.in
diff --git a/software/package/perl-io-interface/perl-io-interface.hash b/buildroot/package/perl-io-interface/perl-io-interface.hash
similarity index 100%
rename from software/package/perl-io-interface/perl-io-interface.hash
rename to buildroot/package/perl-io-interface/perl-io-interface.hash
diff --git a/software/package/perl-io-interface/perl-io-interface.mk b/buildroot/package/perl-io-interface/perl-io-interface.mk
similarity index 100%
rename from software/package/perl-io-interface/perl-io-interface.mk
rename to buildroot/package/perl-io-interface/perl-io-interface.mk
diff --git a/software/package/perl-io-socket-multicast/Config.in b/buildroot/package/perl-io-socket-multicast/Config.in
similarity index 100%
rename from software/package/perl-io-socket-multicast/Config.in
rename to buildroot/package/perl-io-socket-multicast/Config.in
diff --git a/software/package/perl-io-socket-multicast/perl-io-socket-multicast.hash b/buildroot/package/perl-io-socket-multicast/perl-io-socket-multicast.hash
similarity index 100%
rename from software/package/perl-io-socket-multicast/perl-io-socket-multicast.hash
rename to buildroot/package/perl-io-socket-multicast/perl-io-socket-multicast.hash
diff --git a/software/package/perl-io-socket-multicast/perl-io-socket-multicast.mk b/buildroot/package/perl-io-socket-multicast/perl-io-socket-multicast.mk
similarity index 100%
rename from software/package/perl-io-socket-multicast/perl-io-socket-multicast.mk
rename to buildroot/package/perl-io-socket-multicast/perl-io-socket-multicast.mk
diff --git a/software/package/perl-io-socket-ssl/Config.in b/buildroot/package/perl-io-socket-ssl/Config.in
similarity index 100%
rename from software/package/perl-io-socket-ssl/Config.in
rename to buildroot/package/perl-io-socket-ssl/Config.in
diff --git a/software/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash
similarity index 100%
rename from software/package/perl-io-socket-ssl/perl-io-socket-ssl.hash
rename to buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash
diff --git a/software/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
similarity index 100%
rename from software/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
rename to buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
diff --git a/software/package/perl-json-maybexs/Config.in b/buildroot/package/perl-json-maybexs/Config.in
similarity index 100%
rename from software/package/perl-json-maybexs/Config.in
rename to buildroot/package/perl-json-maybexs/Config.in
diff --git a/software/package/perl-json-maybexs/perl-json-maybexs.hash b/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash
similarity index 100%
rename from software/package/perl-json-maybexs/perl-json-maybexs.hash
rename to buildroot/package/perl-json-maybexs/perl-json-maybexs.hash
diff --git a/software/package/perl-json-maybexs/perl-json-maybexs.mk b/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk
similarity index 100%
rename from software/package/perl-json-maybexs/perl-json-maybexs.mk
rename to buildroot/package/perl-json-maybexs/perl-json-maybexs.mk
diff --git a/software/package/perl-json-tiny/Config.in b/buildroot/package/perl-json-tiny/Config.in
similarity index 100%
rename from software/package/perl-json-tiny/Config.in
rename to buildroot/package/perl-json-tiny/Config.in
diff --git a/software/package/perl-json-tiny/perl-json-tiny.hash b/buildroot/package/perl-json-tiny/perl-json-tiny.hash
similarity index 100%
rename from software/package/perl-json-tiny/perl-json-tiny.hash
rename to buildroot/package/perl-json-tiny/perl-json-tiny.hash
diff --git a/software/package/perl-json-tiny/perl-json-tiny.mk b/buildroot/package/perl-json-tiny/perl-json-tiny.mk
similarity index 100%
rename from software/package/perl-json-tiny/perl-json-tiny.mk
rename to buildroot/package/perl-json-tiny/perl-json-tiny.mk
diff --git a/software/package/perl-libwww-perl/Config.in b/buildroot/package/perl-libwww-perl/Config.in
similarity index 100%
rename from software/package/perl-libwww-perl/Config.in
rename to buildroot/package/perl-libwww-perl/Config.in
diff --git a/software/package/perl-libwww-perl/perl-libwww-perl.hash b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash
similarity index 100%
rename from software/package/perl-libwww-perl/perl-libwww-perl.hash
rename to buildroot/package/perl-libwww-perl/perl-libwww-perl.hash
diff --git a/software/package/perl-libwww-perl/perl-libwww-perl.mk b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk
similarity index 100%
rename from software/package/perl-libwww-perl/perl-libwww-perl.mk
rename to buildroot/package/perl-libwww-perl/perl-libwww-perl.mk
diff --git a/software/package/perl-lwp-mediatypes/Config.in b/buildroot/package/perl-lwp-mediatypes/Config.in
similarity index 100%
rename from software/package/perl-lwp-mediatypes/Config.in
rename to buildroot/package/perl-lwp-mediatypes/Config.in
diff --git a/software/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash b/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash
similarity index 100%
rename from software/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash
rename to buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash
diff --git a/software/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk b/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
similarity index 100%
rename from software/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
rename to buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
diff --git a/software/package/perl-mail-dkim/Config.in b/buildroot/package/perl-mail-dkim/Config.in
similarity index 100%
rename from software/package/perl-mail-dkim/Config.in
rename to buildroot/package/perl-mail-dkim/Config.in
diff --git a/software/package/perl-mail-dkim/perl-mail-dkim.hash b/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash
similarity index 100%
rename from software/package/perl-mail-dkim/perl-mail-dkim.hash
rename to buildroot/package/perl-mail-dkim/perl-mail-dkim.hash
diff --git a/software/package/perl-mail-dkim/perl-mail-dkim.mk b/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk
similarity index 100%
rename from software/package/perl-mail-dkim/perl-mail-dkim.mk
rename to buildroot/package/perl-mail-dkim/perl-mail-dkim.mk
diff --git a/software/package/perl-mailtools/Config.in b/buildroot/package/perl-mailtools/Config.in
similarity index 100%
rename from software/package/perl-mailtools/Config.in
rename to buildroot/package/perl-mailtools/Config.in
diff --git a/software/package/perl-mailtools/perl-mailtools.hash b/buildroot/package/perl-mailtools/perl-mailtools.hash
similarity index 100%
rename from software/package/perl-mailtools/perl-mailtools.hash
rename to buildroot/package/perl-mailtools/perl-mailtools.hash
diff --git a/software/package/perl-mailtools/perl-mailtools.mk b/buildroot/package/perl-mailtools/perl-mailtools.mk
similarity index 100%
rename from software/package/perl-mailtools/perl-mailtools.mk
rename to buildroot/package/perl-mailtools/perl-mailtools.mk
diff --git a/software/package/perl-math-prime-util/Config.in b/buildroot/package/perl-math-prime-util/Config.in
similarity index 100%
rename from software/package/perl-math-prime-util/Config.in
rename to buildroot/package/perl-math-prime-util/Config.in
diff --git a/software/package/perl-math-prime-util/perl-math-prime-util.hash b/buildroot/package/perl-math-prime-util/perl-math-prime-util.hash
similarity index 100%
rename from software/package/perl-math-prime-util/perl-math-prime-util.hash
rename to buildroot/package/perl-math-prime-util/perl-math-prime-util.hash
diff --git a/software/package/perl-math-prime-util/perl-math-prime-util.mk b/buildroot/package/perl-math-prime-util/perl-math-prime-util.mk
similarity index 100%
rename from software/package/perl-math-prime-util/perl-math-prime-util.mk
rename to buildroot/package/perl-math-prime-util/perl-math-prime-util.mk
diff --git a/software/package/perl-mime-base64-urlsafe/Config.in b/buildroot/package/perl-mime-base64-urlsafe/Config.in
similarity index 100%
rename from software/package/perl-mime-base64-urlsafe/Config.in
rename to buildroot/package/perl-mime-base64-urlsafe/Config.in
diff --git a/software/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash b/buildroot/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash
similarity index 100%
rename from software/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash
rename to buildroot/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash
diff --git a/software/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk b/buildroot/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk
similarity index 100%
rename from software/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk
rename to buildroot/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.mk
diff --git a/software/package/perl-mime-tools/Config.in b/buildroot/package/perl-mime-tools/Config.in
similarity index 100%
rename from software/package/perl-mime-tools/Config.in
rename to buildroot/package/perl-mime-tools/Config.in
diff --git a/software/package/perl-mime-tools/perl-mime-tools.hash b/buildroot/package/perl-mime-tools/perl-mime-tools.hash
similarity index 100%
rename from software/package/perl-mime-tools/perl-mime-tools.hash
rename to buildroot/package/perl-mime-tools/perl-mime-tools.hash
diff --git a/software/package/perl-mime-tools/perl-mime-tools.mk b/buildroot/package/perl-mime-tools/perl-mime-tools.mk
similarity index 100%
rename from software/package/perl-mime-tools/perl-mime-tools.mk
rename to buildroot/package/perl-mime-tools/perl-mime-tools.mk
diff --git a/software/package/perl-module-build-tiny/perl-module-build-tiny.hash b/buildroot/package/perl-module-build-tiny/perl-module-build-tiny.hash
similarity index 100%
rename from software/package/perl-module-build-tiny/perl-module-build-tiny.hash
rename to buildroot/package/perl-module-build-tiny/perl-module-build-tiny.hash
diff --git a/software/package/perl-module-build-tiny/perl-module-build-tiny.mk b/buildroot/package/perl-module-build-tiny/perl-module-build-tiny.mk
similarity index 100%
rename from software/package/perl-module-build-tiny/perl-module-build-tiny.mk
rename to buildroot/package/perl-module-build-tiny/perl-module-build-tiny.mk
diff --git a/software/package/perl-module-build/perl-module-build.hash b/buildroot/package/perl-module-build/perl-module-build.hash
similarity index 100%
rename from software/package/perl-module-build/perl-module-build.hash
rename to buildroot/package/perl-module-build/perl-module-build.hash
diff --git a/software/package/perl-module-build/perl-module-build.mk b/buildroot/package/perl-module-build/perl-module-build.mk
similarity index 100%
rename from software/package/perl-module-build/perl-module-build.mk
rename to buildroot/package/perl-module-build/perl-module-build.mk
diff --git a/software/package/perl-module-implementation/Config.in b/buildroot/package/perl-module-implementation/Config.in
similarity index 100%
rename from software/package/perl-module-implementation/Config.in
rename to buildroot/package/perl-module-implementation/Config.in
diff --git a/software/package/perl-module-implementation/perl-module-implementation.hash b/buildroot/package/perl-module-implementation/perl-module-implementation.hash
similarity index 100%
rename from software/package/perl-module-implementation/perl-module-implementation.hash
rename to buildroot/package/perl-module-implementation/perl-module-implementation.hash
diff --git a/software/package/perl-module-implementation/perl-module-implementation.mk b/buildroot/package/perl-module-implementation/perl-module-implementation.mk
similarity index 100%
rename from software/package/perl-module-implementation/perl-module-implementation.mk
rename to buildroot/package/perl-module-implementation/perl-module-implementation.mk
diff --git a/software/package/perl-module-runtime/Config.in b/buildroot/package/perl-module-runtime/Config.in
similarity index 100%
rename from software/package/perl-module-runtime/Config.in
rename to buildroot/package/perl-module-runtime/Config.in
diff --git a/software/package/perl-module-runtime/perl-module-runtime.hash b/buildroot/package/perl-module-runtime/perl-module-runtime.hash
similarity index 100%
rename from software/package/perl-module-runtime/perl-module-runtime.hash
rename to buildroot/package/perl-module-runtime/perl-module-runtime.hash
diff --git a/software/package/perl-module-runtime/perl-module-runtime.mk b/buildroot/package/perl-module-runtime/perl-module-runtime.mk
similarity index 100%
rename from software/package/perl-module-runtime/perl-module-runtime.mk
rename to buildroot/package/perl-module-runtime/perl-module-runtime.mk
diff --git a/software/package/perl-mojolicious-plugin-authentication/Config.in b/buildroot/package/perl-mojolicious-plugin-authentication/Config.in
similarity index 100%
rename from software/package/perl-mojolicious-plugin-authentication/Config.in
rename to buildroot/package/perl-mojolicious-plugin-authentication/Config.in
diff --git a/software/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash b/buildroot/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash
similarity index 100%
rename from software/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash
rename to buildroot/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.hash
diff --git a/software/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk b/buildroot/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk
similarity index 100%
rename from software/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk
rename to buildroot/package/perl-mojolicious-plugin-authentication/perl-mojolicious-plugin-authentication.mk
diff --git a/software/package/perl-mojolicious/Config.in b/buildroot/package/perl-mojolicious/Config.in
similarity index 100%
rename from software/package/perl-mojolicious/Config.in
rename to buildroot/package/perl-mojolicious/Config.in
diff --git a/software/package/perl-mojolicious/perl-mojolicious.hash b/buildroot/package/perl-mojolicious/perl-mojolicious.hash
similarity index 100%
rename from software/package/perl-mojolicious/perl-mojolicious.hash
rename to buildroot/package/perl-mojolicious/perl-mojolicious.hash
diff --git a/software/package/perl-mojolicious/perl-mojolicious.mk b/buildroot/package/perl-mojolicious/perl-mojolicious.mk
similarity index 100%
rename from software/package/perl-mojolicious/perl-mojolicious.mk
rename to buildroot/package/perl-mojolicious/perl-mojolicious.mk
diff --git a/software/package/perl-moo/Config.in b/buildroot/package/perl-moo/Config.in
similarity index 100%
rename from software/package/perl-moo/Config.in
rename to buildroot/package/perl-moo/Config.in
diff --git a/software/package/perl-moo/perl-moo.hash b/buildroot/package/perl-moo/perl-moo.hash
similarity index 100%
rename from software/package/perl-moo/perl-moo.hash
rename to buildroot/package/perl-moo/perl-moo.hash
diff --git a/software/package/perl-moo/perl-moo.mk b/buildroot/package/perl-moo/perl-moo.mk
similarity index 100%
rename from software/package/perl-moo/perl-moo.mk
rename to buildroot/package/perl-moo/perl-moo.mk
diff --git a/software/package/perl-net-dns/Config.in b/buildroot/package/perl-net-dns/Config.in
similarity index 100%
rename from software/package/perl-net-dns/Config.in
rename to buildroot/package/perl-net-dns/Config.in
diff --git a/software/package/perl-net-dns/perl-net-dns.hash b/buildroot/package/perl-net-dns/perl-net-dns.hash
similarity index 100%
rename from software/package/perl-net-dns/perl-net-dns.hash
rename to buildroot/package/perl-net-dns/perl-net-dns.hash
diff --git a/software/package/perl-net-dns/perl-net-dns.mk b/buildroot/package/perl-net-dns/perl-net-dns.mk
similarity index 100%
rename from software/package/perl-net-dns/perl-net-dns.mk
rename to buildroot/package/perl-net-dns/perl-net-dns.mk
diff --git a/software/package/perl-net-http/Config.in b/buildroot/package/perl-net-http/Config.in
similarity index 100%
rename from software/package/perl-net-http/Config.in
rename to buildroot/package/perl-net-http/Config.in
diff --git a/software/package/perl-net-http/perl-net-http.hash b/buildroot/package/perl-net-http/perl-net-http.hash
similarity index 100%
rename from software/package/perl-net-http/perl-net-http.hash
rename to buildroot/package/perl-net-http/perl-net-http.hash
diff --git a/software/package/perl-net-http/perl-net-http.mk b/buildroot/package/perl-net-http/perl-net-http.mk
similarity index 100%
rename from software/package/perl-net-http/perl-net-http.mk
rename to buildroot/package/perl-net-http/perl-net-http.mk
diff --git a/software/package/perl-net-snmp/Config.in b/buildroot/package/perl-net-snmp/Config.in
similarity index 100%
rename from software/package/perl-net-snmp/Config.in
rename to buildroot/package/perl-net-snmp/Config.in
diff --git a/software/package/perl-net-snmp/perl-net-snmp.hash b/buildroot/package/perl-net-snmp/perl-net-snmp.hash
similarity index 100%
rename from software/package/perl-net-snmp/perl-net-snmp.hash
rename to buildroot/package/perl-net-snmp/perl-net-snmp.hash
diff --git a/software/package/perl-net-snmp/perl-net-snmp.mk b/buildroot/package/perl-net-snmp/perl-net-snmp.mk
similarity index 100%
rename from software/package/perl-net-snmp/perl-net-snmp.mk
rename to buildroot/package/perl-net-snmp/perl-net-snmp.mk
diff --git a/software/package/perl-net-ssh2/Config.in b/buildroot/package/perl-net-ssh2/Config.in
similarity index 100%
rename from software/package/perl-net-ssh2/Config.in
rename to buildroot/package/perl-net-ssh2/Config.in
diff --git a/software/package/perl-net-ssh2/perl-net-ssh2.hash b/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash
similarity index 100%
rename from software/package/perl-net-ssh2/perl-net-ssh2.hash
rename to buildroot/package/perl-net-ssh2/perl-net-ssh2.hash
diff --git a/software/package/perl-net-ssh2/perl-net-ssh2.mk b/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk
similarity index 100%
rename from software/package/perl-net-ssh2/perl-net-ssh2.mk
rename to buildroot/package/perl-net-ssh2/perl-net-ssh2.mk
diff --git a/software/package/perl-net-ssleay/0001-fix-build-system.patch b/buildroot/package/perl-net-ssleay/0001-fix-build-system.patch
similarity index 100%
rename from software/package/perl-net-ssleay/0001-fix-build-system.patch
rename to buildroot/package/perl-net-ssleay/0001-fix-build-system.patch
diff --git a/software/package/perl-net-ssleay/Config.in b/buildroot/package/perl-net-ssleay/Config.in
similarity index 100%
rename from software/package/perl-net-ssleay/Config.in
rename to buildroot/package/perl-net-ssleay/Config.in
diff --git a/software/package/perl-net-ssleay/perl-net-ssleay.hash b/buildroot/package/perl-net-ssleay/perl-net-ssleay.hash
similarity index 100%
rename from software/package/perl-net-ssleay/perl-net-ssleay.hash
rename to buildroot/package/perl-net-ssleay/perl-net-ssleay.hash
diff --git a/software/package/perl-net-ssleay/perl-net-ssleay.mk b/buildroot/package/perl-net-ssleay/perl-net-ssleay.mk
similarity index 100%
rename from software/package/perl-net-ssleay/perl-net-ssleay.mk
rename to buildroot/package/perl-net-ssleay/perl-net-ssleay.mk
diff --git a/software/package/perl-net-telnet/Config.in b/buildroot/package/perl-net-telnet/Config.in
similarity index 100%
rename from software/package/perl-net-telnet/Config.in
rename to buildroot/package/perl-net-telnet/Config.in
diff --git a/software/package/perl-net-telnet/perl-net-telnet.hash b/buildroot/package/perl-net-telnet/perl-net-telnet.hash
similarity index 100%
rename from software/package/perl-net-telnet/perl-net-telnet.hash
rename to buildroot/package/perl-net-telnet/perl-net-telnet.hash
diff --git a/software/package/perl-net-telnet/perl-net-telnet.mk b/buildroot/package/perl-net-telnet/perl-net-telnet.mk
similarity index 100%
rename from software/package/perl-net-telnet/perl-net-telnet.mk
rename to buildroot/package/perl-net-telnet/perl-net-telnet.mk
diff --git a/software/package/perl-netaddr-ip/Config.in b/buildroot/package/perl-netaddr-ip/Config.in
similarity index 100%
rename from software/package/perl-netaddr-ip/Config.in
rename to buildroot/package/perl-netaddr-ip/Config.in
diff --git a/software/package/perl-netaddr-ip/perl-netaddr-ip.hash b/buildroot/package/perl-netaddr-ip/perl-netaddr-ip.hash
similarity index 100%
rename from software/package/perl-netaddr-ip/perl-netaddr-ip.hash
rename to buildroot/package/perl-netaddr-ip/perl-netaddr-ip.hash
diff --git a/software/package/perl-netaddr-ip/perl-netaddr-ip.mk b/buildroot/package/perl-netaddr-ip/perl-netaddr-ip.mk
similarity index 100%
rename from software/package/perl-netaddr-ip/perl-netaddr-ip.mk
rename to buildroot/package/perl-netaddr-ip/perl-netaddr-ip.mk
diff --git a/software/package/perl-number-bytes-human/Config.in b/buildroot/package/perl-number-bytes-human/Config.in
similarity index 100%
rename from software/package/perl-number-bytes-human/Config.in
rename to buildroot/package/perl-number-bytes-human/Config.in
diff --git a/software/package/perl-number-bytes-human/perl-number-bytes-human.hash b/buildroot/package/perl-number-bytes-human/perl-number-bytes-human.hash
similarity index 100%
rename from software/package/perl-number-bytes-human/perl-number-bytes-human.hash
rename to buildroot/package/perl-number-bytes-human/perl-number-bytes-human.hash
diff --git a/software/package/perl-number-bytes-human/perl-number-bytes-human.mk b/buildroot/package/perl-number-bytes-human/perl-number-bytes-human.mk
similarity index 100%
rename from software/package/perl-number-bytes-human/perl-number-bytes-human.mk
rename to buildroot/package/perl-number-bytes-human/perl-number-bytes-human.mk
diff --git a/software/package/perl-package-stash/Config.in b/buildroot/package/perl-package-stash/Config.in
similarity index 100%
rename from software/package/perl-package-stash/Config.in
rename to buildroot/package/perl-package-stash/Config.in
diff --git a/software/package/perl-package-stash/perl-package-stash.hash b/buildroot/package/perl-package-stash/perl-package-stash.hash
similarity index 100%
rename from software/package/perl-package-stash/perl-package-stash.hash
rename to buildroot/package/perl-package-stash/perl-package-stash.hash
diff --git a/software/package/perl-package-stash/perl-package-stash.mk b/buildroot/package/perl-package-stash/perl-package-stash.mk
similarity index 100%
rename from software/package/perl-package-stash/perl-package-stash.mk
rename to buildroot/package/perl-package-stash/perl-package-stash.mk
diff --git a/software/package/perl-params-util/Config.in b/buildroot/package/perl-params-util/Config.in
similarity index 100%
rename from software/package/perl-params-util/Config.in
rename to buildroot/package/perl-params-util/Config.in
diff --git a/software/package/perl-params-util/perl-params-util.hash b/buildroot/package/perl-params-util/perl-params-util.hash
similarity index 100%
rename from software/package/perl-params-util/perl-params-util.hash
rename to buildroot/package/perl-params-util/perl-params-util.hash
diff --git a/software/package/perl-params-util/perl-params-util.mk b/buildroot/package/perl-params-util/perl-params-util.mk
similarity index 100%
rename from software/package/perl-params-util/perl-params-util.mk
rename to buildroot/package/perl-params-util/perl-params-util.mk
diff --git a/software/package/perl-path-tiny/Config.in b/buildroot/package/perl-path-tiny/Config.in
similarity index 100%
rename from software/package/perl-path-tiny/Config.in
rename to buildroot/package/perl-path-tiny/Config.in
diff --git a/software/package/perl-path-tiny/perl-path-tiny.hash b/buildroot/package/perl-path-tiny/perl-path-tiny.hash
similarity index 100%
rename from software/package/perl-path-tiny/perl-path-tiny.hash
rename to buildroot/package/perl-path-tiny/perl-path-tiny.hash
diff --git a/software/package/perl-path-tiny/perl-path-tiny.mk b/buildroot/package/perl-path-tiny/perl-path-tiny.mk
similarity index 100%
rename from software/package/perl-path-tiny/perl-path-tiny.mk
rename to buildroot/package/perl-path-tiny/perl-path-tiny.mk
diff --git a/software/package/perl-plack/Config.in b/buildroot/package/perl-plack/Config.in
similarity index 100%
rename from software/package/perl-plack/Config.in
rename to buildroot/package/perl-plack/Config.in
diff --git a/software/package/perl-plack/perl-plack.hash b/buildroot/package/perl-plack/perl-plack.hash
similarity index 100%
rename from software/package/perl-plack/perl-plack.hash
rename to buildroot/package/perl-plack/perl-plack.hash
diff --git a/software/package/perl-plack/perl-plack.mk b/buildroot/package/perl-plack/perl-plack.mk
similarity index 100%
rename from software/package/perl-plack/perl-plack.mk
rename to buildroot/package/perl-plack/perl-plack.mk
diff --git a/software/package/perl-posix-strftime-compiler/Config.in b/buildroot/package/perl-posix-strftime-compiler/Config.in
similarity index 100%
rename from software/package/perl-posix-strftime-compiler/Config.in
rename to buildroot/package/perl-posix-strftime-compiler/Config.in
diff --git a/software/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash b/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash
similarity index 100%
rename from software/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash
rename to buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.hash
diff --git a/software/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk b/buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk
similarity index 100%
rename from software/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk
rename to buildroot/package/perl-posix-strftime-compiler/perl-posix-strftime-compiler.mk
diff --git a/software/package/perl-role-tiny/Config.in b/buildroot/package/perl-role-tiny/Config.in
similarity index 100%
rename from software/package/perl-role-tiny/Config.in
rename to buildroot/package/perl-role-tiny/Config.in
diff --git a/software/package/perl-role-tiny/perl-role-tiny.hash b/buildroot/package/perl-role-tiny/perl-role-tiny.hash
similarity index 100%
rename from software/package/perl-role-tiny/perl-role-tiny.hash
rename to buildroot/package/perl-role-tiny/perl-role-tiny.hash
diff --git a/software/package/perl-role-tiny/perl-role-tiny.mk b/buildroot/package/perl-role-tiny/perl-role-tiny.mk
similarity index 100%
rename from software/package/perl-role-tiny/perl-role-tiny.mk
rename to buildroot/package/perl-role-tiny/perl-role-tiny.mk
diff --git a/software/package/perl-stream-buffered/Config.in b/buildroot/package/perl-stream-buffered/Config.in
similarity index 100%
rename from software/package/perl-stream-buffered/Config.in
rename to buildroot/package/perl-stream-buffered/Config.in
diff --git a/software/package/perl-stream-buffered/perl-stream-buffered.hash b/buildroot/package/perl-stream-buffered/perl-stream-buffered.hash
similarity index 100%
rename from software/package/perl-stream-buffered/perl-stream-buffered.hash
rename to buildroot/package/perl-stream-buffered/perl-stream-buffered.hash
diff --git a/software/package/perl-stream-buffered/perl-stream-buffered.mk b/buildroot/package/perl-stream-buffered/perl-stream-buffered.mk
similarity index 100%
rename from software/package/perl-stream-buffered/perl-stream-buffered.mk
rename to buildroot/package/perl-stream-buffered/perl-stream-buffered.mk
diff --git a/software/package/perl-sub-exporter-progressive/Config.in b/buildroot/package/perl-sub-exporter-progressive/Config.in
similarity index 100%
rename from software/package/perl-sub-exporter-progressive/Config.in
rename to buildroot/package/perl-sub-exporter-progressive/Config.in
diff --git a/software/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash b/buildroot/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash
similarity index 100%
rename from software/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash
rename to buildroot/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash
diff --git a/software/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.mk b/buildroot/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.mk
similarity index 100%
rename from software/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.mk
rename to buildroot/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.mk
diff --git a/software/package/perl-sub-install/Config.in b/buildroot/package/perl-sub-install/Config.in
similarity index 100%
rename from software/package/perl-sub-install/Config.in
rename to buildroot/package/perl-sub-install/Config.in
diff --git a/software/package/perl-sub-install/perl-sub-install.hash b/buildroot/package/perl-sub-install/perl-sub-install.hash
similarity index 100%
rename from software/package/perl-sub-install/perl-sub-install.hash
rename to buildroot/package/perl-sub-install/perl-sub-install.hash
diff --git a/software/package/perl-sub-install/perl-sub-install.mk b/buildroot/package/perl-sub-install/perl-sub-install.mk
similarity index 100%
rename from software/package/perl-sub-install/perl-sub-install.mk
rename to buildroot/package/perl-sub-install/perl-sub-install.mk
diff --git a/software/package/perl-sub-quote/Config.in b/buildroot/package/perl-sub-quote/Config.in
similarity index 100%
rename from software/package/perl-sub-quote/Config.in
rename to buildroot/package/perl-sub-quote/Config.in
diff --git a/software/package/perl-sub-quote/perl-sub-quote.hash b/buildroot/package/perl-sub-quote/perl-sub-quote.hash
similarity index 100%
rename from software/package/perl-sub-quote/perl-sub-quote.hash
rename to buildroot/package/perl-sub-quote/perl-sub-quote.hash
diff --git a/software/package/perl-sub-quote/perl-sub-quote.mk b/buildroot/package/perl-sub-quote/perl-sub-quote.mk
similarity index 100%
rename from software/package/perl-sub-quote/perl-sub-quote.mk
rename to buildroot/package/perl-sub-quote/perl-sub-quote.mk
diff --git a/software/package/perl-sys-cpu/0001-remove-extraneous-include.patch b/buildroot/package/perl-sys-cpu/0001-remove-extraneous-include.patch
similarity index 100%
rename from software/package/perl-sys-cpu/0001-remove-extraneous-include.patch
rename to buildroot/package/perl-sys-cpu/0001-remove-extraneous-include.patch
diff --git a/software/package/perl-sys-cpu/Config.in b/buildroot/package/perl-sys-cpu/Config.in
similarity index 100%
rename from software/package/perl-sys-cpu/Config.in
rename to buildroot/package/perl-sys-cpu/Config.in
diff --git a/software/package/perl-sys-cpu/perl-sys-cpu.hash b/buildroot/package/perl-sys-cpu/perl-sys-cpu.hash
similarity index 100%
rename from software/package/perl-sys-cpu/perl-sys-cpu.hash
rename to buildroot/package/perl-sys-cpu/perl-sys-cpu.hash
diff --git a/software/package/perl-sys-cpu/perl-sys-cpu.mk b/buildroot/package/perl-sys-cpu/perl-sys-cpu.mk
similarity index 100%
rename from software/package/perl-sys-cpu/perl-sys-cpu.mk
rename to buildroot/package/perl-sys-cpu/perl-sys-cpu.mk
diff --git a/software/package/perl-sys-meminfo/Config.in b/buildroot/package/perl-sys-meminfo/Config.in
similarity index 100%
rename from software/package/perl-sys-meminfo/Config.in
rename to buildroot/package/perl-sys-meminfo/Config.in
diff --git a/software/package/perl-sys-meminfo/perl-sys-meminfo.hash b/buildroot/package/perl-sys-meminfo/perl-sys-meminfo.hash
similarity index 100%
rename from software/package/perl-sys-meminfo/perl-sys-meminfo.hash
rename to buildroot/package/perl-sys-meminfo/perl-sys-meminfo.hash
diff --git a/software/package/perl-sys-meminfo/perl-sys-meminfo.mk b/buildroot/package/perl-sys-meminfo/perl-sys-meminfo.mk
similarity index 100%
rename from software/package/perl-sys-meminfo/perl-sys-meminfo.mk
rename to buildroot/package/perl-sys-meminfo/perl-sys-meminfo.mk
diff --git a/software/package/perl-sys-mmap/Config.in b/buildroot/package/perl-sys-mmap/Config.in
similarity index 100%
rename from software/package/perl-sys-mmap/Config.in
rename to buildroot/package/perl-sys-mmap/Config.in
diff --git a/software/package/perl-sys-mmap/perl-sys-mmap.hash b/buildroot/package/perl-sys-mmap/perl-sys-mmap.hash
similarity index 100%
rename from software/package/perl-sys-mmap/perl-sys-mmap.hash
rename to buildroot/package/perl-sys-mmap/perl-sys-mmap.hash
diff --git a/software/package/perl-sys-mmap/perl-sys-mmap.mk b/buildroot/package/perl-sys-mmap/perl-sys-mmap.mk
similarity index 100%
rename from software/package/perl-sys-mmap/perl-sys-mmap.mk
rename to buildroot/package/perl-sys-mmap/perl-sys-mmap.mk
diff --git a/software/package/perl-time-parsedate/Config.in b/buildroot/package/perl-time-parsedate/Config.in
similarity index 100%
rename from software/package/perl-time-parsedate/Config.in
rename to buildroot/package/perl-time-parsedate/Config.in
diff --git a/software/package/perl-time-parsedate/perl-time-parsedate.hash b/buildroot/package/perl-time-parsedate/perl-time-parsedate.hash
similarity index 100%
rename from software/package/perl-time-parsedate/perl-time-parsedate.hash
rename to buildroot/package/perl-time-parsedate/perl-time-parsedate.hash
diff --git a/software/package/perl-time-parsedate/perl-time-parsedate.mk b/buildroot/package/perl-time-parsedate/perl-time-parsedate.mk
similarity index 100%
rename from software/package/perl-time-parsedate/perl-time-parsedate.mk
rename to buildroot/package/perl-time-parsedate/perl-time-parsedate.mk
diff --git a/software/package/perl-timedate/Config.in b/buildroot/package/perl-timedate/Config.in
similarity index 100%
rename from software/package/perl-timedate/Config.in
rename to buildroot/package/perl-timedate/Config.in
diff --git a/software/package/perl-timedate/perl-timedate.hash b/buildroot/package/perl-timedate/perl-timedate.hash
similarity index 100%
rename from software/package/perl-timedate/perl-timedate.hash
rename to buildroot/package/perl-timedate/perl-timedate.hash
diff --git a/software/package/perl-timedate/perl-timedate.mk b/buildroot/package/perl-timedate/perl-timedate.mk
similarity index 100%
rename from software/package/perl-timedate/perl-timedate.mk
rename to buildroot/package/perl-timedate/perl-timedate.mk
diff --git a/software/package/perl-try-tiny/Config.in b/buildroot/package/perl-try-tiny/Config.in
similarity index 100%
rename from software/package/perl-try-tiny/Config.in
rename to buildroot/package/perl-try-tiny/Config.in
diff --git a/software/package/perl-try-tiny/perl-try-tiny.hash b/buildroot/package/perl-try-tiny/perl-try-tiny.hash
similarity index 100%
rename from software/package/perl-try-tiny/perl-try-tiny.hash
rename to buildroot/package/perl-try-tiny/perl-try-tiny.hash
diff --git a/software/package/perl-try-tiny/perl-try-tiny.mk b/buildroot/package/perl-try-tiny/perl-try-tiny.mk
similarity index 100%
rename from software/package/perl-try-tiny/perl-try-tiny.mk
rename to buildroot/package/perl-try-tiny/perl-try-tiny.mk
diff --git a/software/package/perl-type-tiny/Config.in b/buildroot/package/perl-type-tiny/Config.in
similarity index 100%
rename from software/package/perl-type-tiny/Config.in
rename to buildroot/package/perl-type-tiny/Config.in
diff --git a/software/package/perl-type-tiny/perl-type-tiny.hash b/buildroot/package/perl-type-tiny/perl-type-tiny.hash
similarity index 100%
rename from software/package/perl-type-tiny/perl-type-tiny.hash
rename to buildroot/package/perl-type-tiny/perl-type-tiny.hash
diff --git a/software/package/perl-type-tiny/perl-type-tiny.mk b/buildroot/package/perl-type-tiny/perl-type-tiny.mk
similarity index 100%
rename from software/package/perl-type-tiny/perl-type-tiny.mk
rename to buildroot/package/perl-type-tiny/perl-type-tiny.mk
diff --git a/software/package/perl-uri/Config.in b/buildroot/package/perl-uri/Config.in
similarity index 100%
rename from software/package/perl-uri/Config.in
rename to buildroot/package/perl-uri/Config.in
diff --git a/software/package/perl-uri/perl-uri.hash b/buildroot/package/perl-uri/perl-uri.hash
similarity index 100%
rename from software/package/perl-uri/perl-uri.hash
rename to buildroot/package/perl-uri/perl-uri.hash
diff --git a/software/package/perl-uri/perl-uri.mk b/buildroot/package/perl-uri/perl-uri.mk
similarity index 100%
rename from software/package/perl-uri/perl-uri.mk
rename to buildroot/package/perl-uri/perl-uri.mk
diff --git a/software/package/perl-www-form-urlencoded/Config.in b/buildroot/package/perl-www-form-urlencoded/Config.in
similarity index 100%
rename from software/package/perl-www-form-urlencoded/Config.in
rename to buildroot/package/perl-www-form-urlencoded/Config.in
diff --git a/software/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash b/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash
similarity index 100%
rename from software/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash
rename to buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash
diff --git a/software/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk b/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk
similarity index 100%
rename from software/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk
rename to buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk
diff --git a/software/package/perl-www-robotrules/Config.in b/buildroot/package/perl-www-robotrules/Config.in
similarity index 100%
rename from software/package/perl-www-robotrules/Config.in
rename to buildroot/package/perl-www-robotrules/Config.in
diff --git a/software/package/perl-www-robotrules/perl-www-robotrules.hash b/buildroot/package/perl-www-robotrules/perl-www-robotrules.hash
similarity index 100%
rename from software/package/perl-www-robotrules/perl-www-robotrules.hash
rename to buildroot/package/perl-www-robotrules/perl-www-robotrules.hash
diff --git a/software/package/perl-www-robotrules/perl-www-robotrules.mk b/buildroot/package/perl-www-robotrules/perl-www-robotrules.mk
similarity index 100%
rename from software/package/perl-www-robotrules/perl-www-robotrules.mk
rename to buildroot/package/perl-www-robotrules/perl-www-robotrules.mk
diff --git a/software/package/perl-x10/Config.in b/buildroot/package/perl-x10/Config.in
similarity index 100%
rename from software/package/perl-x10/Config.in
rename to buildroot/package/perl-x10/Config.in
diff --git a/software/package/perl-x10/perl-x10.hash b/buildroot/package/perl-x10/perl-x10.hash
similarity index 100%
rename from software/package/perl-x10/perl-x10.hash
rename to buildroot/package/perl-x10/perl-x10.hash
diff --git a/software/package/perl-x10/perl-x10.mk b/buildroot/package/perl-x10/perl-x10.mk
similarity index 100%
rename from software/package/perl-x10/perl-x10.mk
rename to buildroot/package/perl-x10/perl-x10.mk
diff --git a/software/package/perl-xml-libxml/0001-Makefile-PL.patch b/buildroot/package/perl-xml-libxml/0001-Makefile-PL.patch
similarity index 100%
rename from software/package/perl-xml-libxml/0001-Makefile-PL.patch
rename to buildroot/package/perl-xml-libxml/0001-Makefile-PL.patch
diff --git a/software/package/perl-xml-libxml/Config.in b/buildroot/package/perl-xml-libxml/Config.in
similarity index 100%
rename from software/package/perl-xml-libxml/Config.in
rename to buildroot/package/perl-xml-libxml/Config.in
diff --git a/software/package/perl-xml-libxml/perl-xml-libxml.hash b/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash
similarity index 100%
rename from software/package/perl-xml-libxml/perl-xml-libxml.hash
rename to buildroot/package/perl-xml-libxml/perl-xml-libxml.hash
diff --git a/software/package/perl-xml-libxml/perl-xml-libxml.mk b/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk
similarity index 100%
rename from software/package/perl-xml-libxml/perl-xml-libxml.mk
rename to buildroot/package/perl-xml-libxml/perl-xml-libxml.mk
diff --git a/software/package/perl-xml-namespacesupport/Config.in b/buildroot/package/perl-xml-namespacesupport/Config.in
similarity index 100%
rename from software/package/perl-xml-namespacesupport/Config.in
rename to buildroot/package/perl-xml-namespacesupport/Config.in
diff --git a/software/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash b/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash
similarity index 100%
rename from software/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash
rename to buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash
diff --git a/software/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk b/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
similarity index 100%
rename from software/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
rename to buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
diff --git a/software/package/perl-xml-sax-base/Config.in b/buildroot/package/perl-xml-sax-base/Config.in
similarity index 100%
rename from software/package/perl-xml-sax-base/Config.in
rename to buildroot/package/perl-xml-sax-base/Config.in
diff --git a/software/package/perl-xml-sax-base/perl-xml-sax-base.hash b/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.hash
similarity index 100%
rename from software/package/perl-xml-sax-base/perl-xml-sax-base.hash
rename to buildroot/package/perl-xml-sax-base/perl-xml-sax-base.hash
diff --git a/software/package/perl-xml-sax-base/perl-xml-sax-base.mk b/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.mk
similarity index 100%
rename from software/package/perl-xml-sax-base/perl-xml-sax-base.mk
rename to buildroot/package/perl-xml-sax-base/perl-xml-sax-base.mk
diff --git a/software/package/perl-xml-sax/Config.in b/buildroot/package/perl-xml-sax/Config.in
similarity index 100%
rename from software/package/perl-xml-sax/Config.in
rename to buildroot/package/perl-xml-sax/Config.in
diff --git a/software/package/perl-xml-sax/perl-xml-sax.hash b/buildroot/package/perl-xml-sax/perl-xml-sax.hash
similarity index 100%
rename from software/package/perl-xml-sax/perl-xml-sax.hash
rename to buildroot/package/perl-xml-sax/perl-xml-sax.hash
diff --git a/software/package/perl-xml-sax/perl-xml-sax.mk b/buildroot/package/perl-xml-sax/perl-xml-sax.mk
similarity index 100%
rename from software/package/perl-xml-sax/perl-xml-sax.mk
rename to buildroot/package/perl-xml-sax/perl-xml-sax.mk
diff --git a/software/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch b/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch
similarity index 100%
rename from software/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch
rename to buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch
diff --git a/software/package/perl/Config.in b/buildroot/package/perl/Config.in
similarity index 100%
rename from software/package/perl/Config.in
rename to buildroot/package/perl/Config.in
diff --git a/software/package/perl/perl.hash b/buildroot/package/perl/perl.hash
similarity index 100%
rename from software/package/perl/perl.hash
rename to buildroot/package/perl/perl.hash
diff --git a/software/package/perl/perl.mk b/buildroot/package/perl/perl.mk
similarity index 100%
rename from software/package/perl/perl.mk
rename to buildroot/package/perl/perl.mk
diff --git a/software/package/phidgetwebservice/Config.in b/buildroot/package/phidgetwebservice/Config.in
similarity index 100%
rename from software/package/phidgetwebservice/Config.in
rename to buildroot/package/phidgetwebservice/Config.in
diff --git a/software/package/phidgetwebservice/phidgetwebservice.hash b/buildroot/package/phidgetwebservice/phidgetwebservice.hash
similarity index 100%
rename from software/package/phidgetwebservice/phidgetwebservice.hash
rename to buildroot/package/phidgetwebservice/phidgetwebservice.hash
diff --git a/software/package/phidgetwebservice/phidgetwebservice.mk b/buildroot/package/phidgetwebservice/phidgetwebservice.mk
similarity index 100%
rename from software/package/phidgetwebservice/phidgetwebservice.mk
rename to buildroot/package/phidgetwebservice/phidgetwebservice.mk
diff --git a/software/package/php-amqp/Config.in b/buildroot/package/php-amqp/Config.in
similarity index 100%
rename from software/package/php-amqp/Config.in
rename to buildroot/package/php-amqp/Config.in
diff --git a/software/package/php-amqp/php-amqp.hash b/buildroot/package/php-amqp/php-amqp.hash
similarity index 100%
rename from software/package/php-amqp/php-amqp.hash
rename to buildroot/package/php-amqp/php-amqp.hash
diff --git a/software/package/php-amqp/php-amqp.mk b/buildroot/package/php-amqp/php-amqp.mk
similarity index 100%
rename from software/package/php-amqp/php-amqp.mk
rename to buildroot/package/php-amqp/php-amqp.mk
diff --git a/software/package/php-geoip/Config.in b/buildroot/package/php-geoip/Config.in
similarity index 100%
rename from software/package/php-geoip/Config.in
rename to buildroot/package/php-geoip/Config.in
diff --git a/software/package/php-geoip/php-geoip.hash b/buildroot/package/php-geoip/php-geoip.hash
similarity index 100%
rename from software/package/php-geoip/php-geoip.hash
rename to buildroot/package/php-geoip/php-geoip.hash
diff --git a/software/package/php-geoip/php-geoip.mk b/buildroot/package/php-geoip/php-geoip.mk
similarity index 100%
rename from software/package/php-geoip/php-geoip.mk
rename to buildroot/package/php-geoip/php-geoip.mk
diff --git a/software/package/php-gnupg/Config.in b/buildroot/package/php-gnupg/Config.in
similarity index 100%
rename from software/package/php-gnupg/Config.in
rename to buildroot/package/php-gnupg/Config.in
diff --git a/software/package/php-gnupg/php-gnupg.hash b/buildroot/package/php-gnupg/php-gnupg.hash
similarity index 100%
rename from software/package/php-gnupg/php-gnupg.hash
rename to buildroot/package/php-gnupg/php-gnupg.hash
diff --git a/software/package/php-gnupg/php-gnupg.mk b/buildroot/package/php-gnupg/php-gnupg.mk
similarity index 100%
rename from software/package/php-gnupg/php-gnupg.mk
rename to buildroot/package/php-gnupg/php-gnupg.mk
diff --git a/software/package/php-imagick/Config.in b/buildroot/package/php-imagick/Config.in
similarity index 100%
rename from software/package/php-imagick/Config.in
rename to buildroot/package/php-imagick/Config.in
diff --git a/software/package/php-imagick/php-imagick.hash b/buildroot/package/php-imagick/php-imagick.hash
similarity index 100%
rename from software/package/php-imagick/php-imagick.hash
rename to buildroot/package/php-imagick/php-imagick.hash
diff --git a/software/package/php-imagick/php-imagick.mk b/buildroot/package/php-imagick/php-imagick.mk
similarity index 100%
rename from software/package/php-imagick/php-imagick.mk
rename to buildroot/package/php-imagick/php-imagick.mk
diff --git a/software/package/php-memcached/Config.in b/buildroot/package/php-memcached/Config.in
similarity index 100%
rename from software/package/php-memcached/Config.in
rename to buildroot/package/php-memcached/Config.in
diff --git a/software/package/php-memcached/php-memcached.hash b/buildroot/package/php-memcached/php-memcached.hash
similarity index 100%
rename from software/package/php-memcached/php-memcached.hash
rename to buildroot/package/php-memcached/php-memcached.hash
diff --git a/software/package/php-memcached/php-memcached.mk b/buildroot/package/php-memcached/php-memcached.mk
similarity index 100%
rename from software/package/php-memcached/php-memcached.mk
rename to buildroot/package/php-memcached/php-memcached.mk
diff --git a/software/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch b/buildroot/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch
similarity index 100%
rename from software/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch
rename to buildroot/package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch
diff --git a/software/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch b/buildroot/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch
similarity index 100%
rename from software/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch
rename to buildroot/package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch
diff --git a/software/package/php-ssh2/Config.in b/buildroot/package/php-ssh2/Config.in
similarity index 100%
rename from software/package/php-ssh2/Config.in
rename to buildroot/package/php-ssh2/Config.in
diff --git a/software/package/php-ssh2/php-ssh2.hash b/buildroot/package/php-ssh2/php-ssh2.hash
similarity index 100%
rename from software/package/php-ssh2/php-ssh2.hash
rename to buildroot/package/php-ssh2/php-ssh2.hash
diff --git a/software/package/php-ssh2/php-ssh2.mk b/buildroot/package/php-ssh2/php-ssh2.mk
similarity index 100%
rename from software/package/php-ssh2/php-ssh2.mk
rename to buildroot/package/php-ssh2/php-ssh2.mk
diff --git a/software/package/php-yaml/Config.in b/buildroot/package/php-yaml/Config.in
similarity index 100%
rename from software/package/php-yaml/Config.in
rename to buildroot/package/php-yaml/Config.in
diff --git a/software/package/php-yaml/php-yaml.hash b/buildroot/package/php-yaml/php-yaml.hash
similarity index 100%
rename from software/package/php-yaml/php-yaml.hash
rename to buildroot/package/php-yaml/php-yaml.hash
diff --git a/software/package/php-yaml/php-yaml.mk b/buildroot/package/php-yaml/php-yaml.mk
similarity index 100%
rename from software/package/php-yaml/php-yaml.mk
rename to buildroot/package/php-yaml/php-yaml.mk
diff --git a/software/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch b/buildroot/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch
similarity index 100%
rename from software/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch
rename to buildroot/package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch
diff --git a/software/package/php-zmq/Config.in b/buildroot/package/php-zmq/Config.in
similarity index 100%
rename from software/package/php-zmq/Config.in
rename to buildroot/package/php-zmq/Config.in
diff --git a/software/package/php-zmq/php-zmq.hash b/buildroot/package/php-zmq/php-zmq.hash
similarity index 100%
rename from software/package/php-zmq/php-zmq.hash
rename to buildroot/package/php-zmq/php-zmq.hash
diff --git a/software/package/php-zmq/php-zmq.mk b/buildroot/package/php-zmq/php-zmq.mk
similarity index 100%
rename from software/package/php-zmq/php-zmq.mk
rename to buildroot/package/php-zmq/php-zmq.mk
diff --git a/software/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
similarity index 100%
rename from software/package/php/0001-acinclude.m4-don-t-unset-variables.patch
rename to buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
diff --git a/software/package/php/0002-iconv-tweak-iconv-detection.patch b/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
similarity index 100%
rename from software/package/php/0002-iconv-tweak-iconv-detection.patch
rename to buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
diff --git a/software/package/php/0003-configure-disable-the-phar-tool.patch b/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
similarity index 100%
rename from software/package/php/0003-configure-disable-the-phar-tool.patch
rename to buildroot/package/php/0003-configure-disable-the-phar-tool.patch
diff --git a/software/package/php/0004-Call-apxs-with-correct-prefix.patch b/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch
similarity index 100%
rename from software/package/php/0004-Call-apxs-with-correct-prefix.patch
rename to buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch
diff --git a/software/package/php/Config.ext b/buildroot/package/php/Config.ext
similarity index 100%
rename from software/package/php/Config.ext
rename to buildroot/package/php/Config.ext
diff --git a/software/package/php/Config.in b/buildroot/package/php/Config.in
similarity index 100%
rename from software/package/php/Config.in
rename to buildroot/package/php/Config.in
diff --git a/software/package/php/php-fpm.conf b/buildroot/package/php/php-fpm.conf
similarity index 100%
rename from software/package/php/php-fpm.conf
rename to buildroot/package/php/php-fpm.conf
diff --git a/software/package/php/php.hash b/buildroot/package/php/php.hash
similarity index 100%
rename from software/package/php/php.hash
rename to buildroot/package/php/php.hash
diff --git a/software/package/php/php.mk b/buildroot/package/php/php.mk
similarity index 100%
rename from software/package/php/php.mk
rename to buildroot/package/php/php.mk
diff --git a/software/package/physfs/Config.in b/buildroot/package/physfs/Config.in
similarity index 100%
rename from software/package/physfs/Config.in
rename to buildroot/package/physfs/Config.in
diff --git a/software/package/physfs/physfs.hash b/buildroot/package/physfs/physfs.hash
similarity index 100%
rename from software/package/physfs/physfs.hash
rename to buildroot/package/physfs/physfs.hash
diff --git a/software/package/physfs/physfs.mk b/buildroot/package/physfs/physfs.mk
similarity index 100%
rename from software/package/physfs/physfs.mk
rename to buildroot/package/physfs/physfs.mk
diff --git a/software/package/phytool/Config.in b/buildroot/package/phytool/Config.in
similarity index 100%
rename from software/package/phytool/Config.in
rename to buildroot/package/phytool/Config.in
diff --git a/software/package/phytool/phytool.hash b/buildroot/package/phytool/phytool.hash
similarity index 100%
rename from software/package/phytool/phytool.hash
rename to buildroot/package/phytool/phytool.hash
diff --git a/software/package/phytool/phytool.mk b/buildroot/package/phytool/phytool.mk
similarity index 100%
rename from software/package/phytool/phytool.mk
rename to buildroot/package/phytool/phytool.mk
diff --git a/software/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch b/buildroot/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch
similarity index 100%
rename from software/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch
rename to buildroot/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch
diff --git a/software/package/picocom/Config.in b/buildroot/package/picocom/Config.in
similarity index 100%
rename from software/package/picocom/Config.in
rename to buildroot/package/picocom/Config.in
diff --git a/software/package/picocom/picocom.hash b/buildroot/package/picocom/picocom.hash
similarity index 100%
rename from software/package/picocom/picocom.hash
rename to buildroot/package/picocom/picocom.hash
diff --git a/software/package/picocom/picocom.mk b/buildroot/package/picocom/picocom.mk
similarity index 100%
rename from software/package/picocom/picocom.mk
rename to buildroot/package/picocom/picocom.mk
diff --git a/software/package/pifmrds/0001-Makefile-cross-compile-friendly.patch b/buildroot/package/pifmrds/0001-Makefile-cross-compile-friendly.patch
similarity index 100%
rename from software/package/pifmrds/0001-Makefile-cross-compile-friendly.patch
rename to buildroot/package/pifmrds/0001-Makefile-cross-compile-friendly.patch
diff --git a/software/package/pifmrds/0002-Makefile-use-LDFLAGS.patch b/buildroot/package/pifmrds/0002-Makefile-use-LDFLAGS.patch
similarity index 100%
rename from software/package/pifmrds/0002-Makefile-use-LDFLAGS.patch
rename to buildroot/package/pifmrds/0002-Makefile-use-LDFLAGS.patch
diff --git a/software/package/pifmrds/0003-Makefile-fix-static-link.patch b/buildroot/package/pifmrds/0003-Makefile-fix-static-link.patch
similarity index 100%
rename from software/package/pifmrds/0003-Makefile-fix-static-link.patch
rename to buildroot/package/pifmrds/0003-Makefile-fix-static-link.patch
diff --git a/software/package/pifmrds/Config.in b/buildroot/package/pifmrds/Config.in
similarity index 100%
rename from software/package/pifmrds/Config.in
rename to buildroot/package/pifmrds/Config.in
diff --git a/software/package/pifmrds/pifmrds.hash b/buildroot/package/pifmrds/pifmrds.hash
similarity index 100%
rename from software/package/pifmrds/pifmrds.hash
rename to buildroot/package/pifmrds/pifmrds.hash
diff --git a/software/package/pifmrds/pifmrds.mk b/buildroot/package/pifmrds/pifmrds.mk
similarity index 100%
rename from software/package/pifmrds/pifmrds.mk
rename to buildroot/package/pifmrds/pifmrds.mk
diff --git a/software/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch b/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch
similarity index 100%
rename from software/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch
rename to buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch
diff --git a/software/package/piglit/Config.in b/buildroot/package/piglit/Config.in
similarity index 100%
rename from software/package/piglit/Config.in
rename to buildroot/package/piglit/Config.in
diff --git a/software/package/piglit/piglit.hash b/buildroot/package/piglit/piglit.hash
similarity index 100%
rename from software/package/piglit/piglit.hash
rename to buildroot/package/piglit/piglit.hash
diff --git a/software/package/piglit/piglit.mk b/buildroot/package/piglit/piglit.mk
similarity index 100%
rename from software/package/piglit/piglit.mk
rename to buildroot/package/piglit/piglit.mk
diff --git a/software/package/pigpio/Config.in b/buildroot/package/pigpio/Config.in
similarity index 100%
rename from software/package/pigpio/Config.in
rename to buildroot/package/pigpio/Config.in
diff --git a/software/package/pigpio/pigpio.hash b/buildroot/package/pigpio/pigpio.hash
similarity index 100%
rename from software/package/pigpio/pigpio.hash
rename to buildroot/package/pigpio/pigpio.hash
diff --git a/software/package/pigpio/pigpio.mk b/buildroot/package/pigpio/pigpio.mk
similarity index 100%
rename from software/package/pigpio/pigpio.mk
rename to buildroot/package/pigpio/pigpio.mk
diff --git a/software/package/pigz/Config.in b/buildroot/package/pigz/Config.in
similarity index 100%
rename from software/package/pigz/Config.in
rename to buildroot/package/pigz/Config.in
diff --git a/software/package/pigz/pigz.hash b/buildroot/package/pigz/pigz.hash
similarity index 100%
rename from software/package/pigz/pigz.hash
rename to buildroot/package/pigz/pigz.hash
diff --git a/software/package/pigz/pigz.mk b/buildroot/package/pigz/pigz.mk
similarity index 100%
rename from software/package/pigz/pigz.mk
rename to buildroot/package/pigz/pigz.mk
diff --git a/software/package/pimd/Config.in b/buildroot/package/pimd/Config.in
similarity index 100%
rename from software/package/pimd/Config.in
rename to buildroot/package/pimd/Config.in
diff --git a/software/package/pimd/pimd.hash b/buildroot/package/pimd/pimd.hash
similarity index 100%
rename from software/package/pimd/pimd.hash
rename to buildroot/package/pimd/pimd.hash
diff --git a/software/package/pimd/pimd.mk b/buildroot/package/pimd/pimd.mk
similarity index 100%
rename from software/package/pimd/pimd.mk
rename to buildroot/package/pimd/pimd.mk
diff --git a/software/package/pinentry/Config.in b/buildroot/package/pinentry/Config.in
similarity index 100%
rename from software/package/pinentry/Config.in
rename to buildroot/package/pinentry/Config.in
diff --git a/software/package/pinentry/pinentry.hash b/buildroot/package/pinentry/pinentry.hash
similarity index 100%
rename from software/package/pinentry/pinentry.hash
rename to buildroot/package/pinentry/pinentry.hash
diff --git a/software/package/pinentry/pinentry.mk b/buildroot/package/pinentry/pinentry.mk
similarity index 100%
rename from software/package/pinentry/pinentry.mk
rename to buildroot/package/pinentry/pinentry.mk
diff --git a/software/package/pipewire/Config.in b/buildroot/package/pipewire/Config.in
similarity index 100%
rename from software/package/pipewire/Config.in
rename to buildroot/package/pipewire/Config.in
diff --git a/software/package/pipewire/pipewire.hash b/buildroot/package/pipewire/pipewire.hash
similarity index 100%
rename from software/package/pipewire/pipewire.hash
rename to buildroot/package/pipewire/pipewire.hash
diff --git a/software/package/pipewire/pipewire.mk b/buildroot/package/pipewire/pipewire.mk
similarity index 100%
rename from software/package/pipewire/pipewire.mk
rename to buildroot/package/pipewire/pipewire.mk
diff --git a/software/package/pixiewps/Config.in b/buildroot/package/pixiewps/Config.in
similarity index 100%
rename from software/package/pixiewps/Config.in
rename to buildroot/package/pixiewps/Config.in
diff --git a/software/package/pixiewps/pixiewps.hash b/buildroot/package/pixiewps/pixiewps.hash
similarity index 100%
rename from software/package/pixiewps/pixiewps.hash
rename to buildroot/package/pixiewps/pixiewps.hash
diff --git a/software/package/pixiewps/pixiewps.mk b/buildroot/package/pixiewps/pixiewps.mk
similarity index 100%
rename from software/package/pixiewps/pixiewps.mk
rename to buildroot/package/pixiewps/pixiewps.mk
diff --git a/software/package/pixman/0001-Disable-tests.patch b/buildroot/package/pixman/0001-Disable-tests.patch
similarity index 100%
rename from software/package/pixman/0001-Disable-tests.patch
rename to buildroot/package/pixman/0001-Disable-tests.patch
diff --git a/software/package/pixman/Config.in b/buildroot/package/pixman/Config.in
similarity index 100%
rename from software/package/pixman/Config.in
rename to buildroot/package/pixman/Config.in
diff --git a/software/package/pixman/pixman.hash b/buildroot/package/pixman/pixman.hash
similarity index 100%
rename from software/package/pixman/pixman.hash
rename to buildroot/package/pixman/pixman.hash
diff --git a/software/package/pixman/pixman.mk b/buildroot/package/pixman/pixman.mk
similarity index 100%
rename from software/package/pixman/pixman.mk
rename to buildroot/package/pixman/pixman.mk
diff --git a/software/package/pixz/Config.in b/buildroot/package/pixz/Config.in
similarity index 100%
rename from software/package/pixz/Config.in
rename to buildroot/package/pixz/Config.in
diff --git a/software/package/pixz/pixz.hash b/buildroot/package/pixz/pixz.hash
similarity index 100%
rename from software/package/pixz/pixz.hash
rename to buildroot/package/pixz/pixz.hash
diff --git a/software/package/pixz/pixz.mk b/buildroot/package/pixz/pixz.mk
similarity index 100%
rename from software/package/pixz/pixz.mk
rename to buildroot/package/pixz/pixz.mk
diff --git a/software/package/pkg-autotools.mk b/buildroot/package/pkg-autotools.mk
similarity index 100%
rename from software/package/pkg-autotools.mk
rename to buildroot/package/pkg-autotools.mk
diff --git a/software/package/pkg-cmake.mk b/buildroot/package/pkg-cmake.mk
similarity index 100%
rename from software/package/pkg-cmake.mk
rename to buildroot/package/pkg-cmake.mk
diff --git a/software/package/pkg-download.mk b/buildroot/package/pkg-download.mk
similarity index 100%
rename from software/package/pkg-download.mk
rename to buildroot/package/pkg-download.mk
diff --git a/software/package/pkg-generic.mk b/buildroot/package/pkg-generic.mk
similarity index 100%
rename from software/package/pkg-generic.mk
rename to buildroot/package/pkg-generic.mk
diff --git a/software/package/pkg-golang.mk b/buildroot/package/pkg-golang.mk
similarity index 100%
rename from software/package/pkg-golang.mk
rename to buildroot/package/pkg-golang.mk
diff --git a/software/package/pkg-kconfig.mk b/buildroot/package/pkg-kconfig.mk
similarity index 100%
rename from software/package/pkg-kconfig.mk
rename to buildroot/package/pkg-kconfig.mk
diff --git a/software/package/pkg-kernel-module.mk b/buildroot/package/pkg-kernel-module.mk
similarity index 100%
rename from software/package/pkg-kernel-module.mk
rename to buildroot/package/pkg-kernel-module.mk
diff --git a/software/package/pkg-luarocks.mk b/buildroot/package/pkg-luarocks.mk
similarity index 100%
rename from software/package/pkg-luarocks.mk
rename to buildroot/package/pkg-luarocks.mk
diff --git a/software/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk
similarity index 100%
rename from software/package/pkg-meson.mk
rename to buildroot/package/pkg-meson.mk
diff --git a/software/package/pkg-perl.mk b/buildroot/package/pkg-perl.mk
similarity index 100%
rename from software/package/pkg-perl.mk
rename to buildroot/package/pkg-perl.mk
diff --git a/software/package/pkg-python.mk b/buildroot/package/pkg-python.mk
similarity index 100%
rename from software/package/pkg-python.mk
rename to buildroot/package/pkg-python.mk
diff --git a/software/package/pkg-rebar.mk b/buildroot/package/pkg-rebar.mk
similarity index 100%
rename from software/package/pkg-rebar.mk
rename to buildroot/package/pkg-rebar.mk
diff --git a/software/package/pkg-utils.mk b/buildroot/package/pkg-utils.mk
similarity index 100%
rename from software/package/pkg-utils.mk
rename to buildroot/package/pkg-utils.mk
diff --git a/software/package/pkg-virtual.mk b/buildroot/package/pkg-virtual.mk
similarity index 100%
rename from software/package/pkg-virtual.mk
rename to buildroot/package/pkg-virtual.mk
diff --git a/software/package/pkg-waf.mk b/buildroot/package/pkg-waf.mk
similarity index 100%
rename from software/package/pkg-waf.mk
rename to buildroot/package/pkg-waf.mk
diff --git a/software/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
similarity index 100%
rename from software/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
rename to buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
diff --git a/software/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch b/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
similarity index 100%
rename from software/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
rename to buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch
diff --git a/software/package/pkgconf/Config.in b/buildroot/package/pkgconf/Config.in
similarity index 100%
rename from software/package/pkgconf/Config.in
rename to buildroot/package/pkgconf/Config.in
diff --git a/software/package/pkgconf/Config.in.host b/buildroot/package/pkgconf/Config.in.host
similarity index 100%
rename from software/package/pkgconf/Config.in.host
rename to buildroot/package/pkgconf/Config.in.host
diff --git a/software/package/pkgconf/pkg-config.in b/buildroot/package/pkgconf/pkg-config.in
similarity index 100%
rename from software/package/pkgconf/pkg-config.in
rename to buildroot/package/pkgconf/pkg-config.in
diff --git a/software/package/pkgconf/pkgconf.hash b/buildroot/package/pkgconf/pkgconf.hash
similarity index 100%
rename from software/package/pkgconf/pkgconf.hash
rename to buildroot/package/pkgconf/pkgconf.hash
diff --git a/software/package/pkgconf/pkgconf.mk b/buildroot/package/pkgconf/pkgconf.mk
similarity index 100%
rename from software/package/pkgconf/pkgconf.mk
rename to buildroot/package/pkgconf/pkgconf.mk
diff --git a/software/package/pngquant/Config.in b/buildroot/package/pngquant/Config.in
similarity index 100%
rename from software/package/pngquant/Config.in
rename to buildroot/package/pngquant/Config.in
diff --git a/software/package/pngquant/pngquant.hash b/buildroot/package/pngquant/pngquant.hash
similarity index 100%
rename from software/package/pngquant/pngquant.hash
rename to buildroot/package/pngquant/pngquant.hash
diff --git a/software/package/pngquant/pngquant.mk b/buildroot/package/pngquant/pngquant.mk
similarity index 100%
rename from software/package/pngquant/pngquant.mk
rename to buildroot/package/pngquant/pngquant.mk
diff --git a/software/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/buildroot/package/poco/0001-poco-add-the-staging-path-to-search-path.patch
similarity index 100%
rename from software/package/poco/0001-poco-add-the-staging-path-to-search-path.patch
rename to buildroot/package/poco/0001-poco-add-the-staging-path-to-search-path.patch
diff --git a/software/package/poco/0002-Add-support-for-m68000-1856.patch b/buildroot/package/poco/0002-Add-support-for-m68000-1856.patch
similarity index 100%
rename from software/package/poco/0002-Add-support-for-m68000-1856.patch
rename to buildroot/package/poco/0002-Add-support-for-m68000-1856.patch
diff --git a/software/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/buildroot/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch
similarity index 100%
rename from software/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch
rename to buildroot/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch
diff --git a/software/package/poco/Config.in b/buildroot/package/poco/Config.in
similarity index 100%
rename from software/package/poco/Config.in
rename to buildroot/package/poco/Config.in
diff --git a/software/package/poco/poco.hash b/buildroot/package/poco/poco.hash
similarity index 100%
rename from software/package/poco/poco.hash
rename to buildroot/package/poco/poco.hash
diff --git a/software/package/poco/poco.mk b/buildroot/package/poco/poco.mk
similarity index 100%
rename from software/package/poco/poco.mk
rename to buildroot/package/poco/poco.mk
diff --git a/software/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch
similarity index 100%
rename from software/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch
rename to buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch
diff --git a/software/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch
similarity index 100%
rename from software/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch
rename to buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch
diff --git a/software/package/policycoreutils/Config.in b/buildroot/package/policycoreutils/Config.in
similarity index 100%
rename from software/package/policycoreutils/Config.in
rename to buildroot/package/policycoreutils/Config.in
diff --git a/software/package/policycoreutils/policycoreutils.hash b/buildroot/package/policycoreutils/policycoreutils.hash
similarity index 100%
rename from software/package/policycoreutils/policycoreutils.hash
rename to buildroot/package/policycoreutils/policycoreutils.hash
diff --git a/software/package/policycoreutils/policycoreutils.mk b/buildroot/package/policycoreutils/policycoreutils.mk
similarity index 100%
rename from software/package/policycoreutils/policycoreutils.mk
rename to buildroot/package/policycoreutils/policycoreutils.mk
diff --git a/software/package/polkit/0001-make-netgroup-support-optional.patch b/buildroot/package/polkit/0001-make-netgroup-support-optional.patch
similarity index 100%
rename from software/package/polkit/0001-make-netgroup-support-optional.patch
rename to buildroot/package/polkit/0001-make-netgroup-support-optional.patch
diff --git a/software/package/polkit/0002-jsauthority-memleak.patch b/buildroot/package/polkit/0002-jsauthority-memleak.patch
similarity index 100%
rename from software/package/polkit/0002-jsauthority-memleak.patch
rename to buildroot/package/polkit/0002-jsauthority-memleak.patch
diff --git a/software/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch b/buildroot/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch
similarity index 100%
rename from software/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch
rename to buildroot/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch
diff --git a/software/package/polkit/Config.in b/buildroot/package/polkit/Config.in
similarity index 100%
rename from software/package/polkit/Config.in
rename to buildroot/package/polkit/Config.in
diff --git a/software/package/polkit/polkit.hash b/buildroot/package/polkit/polkit.hash
similarity index 100%
rename from software/package/polkit/polkit.hash
rename to buildroot/package/polkit/polkit.hash
diff --git a/software/package/polkit/polkit.mk b/buildroot/package/polkit/polkit.mk
similarity index 100%
rename from software/package/polkit/polkit.mk
rename to buildroot/package/polkit/polkit.mk
diff --git a/software/package/polkit/polkit.service b/buildroot/package/polkit/polkit.service
similarity index 100%
rename from software/package/polkit/polkit.service
rename to buildroot/package/polkit/polkit.service
diff --git a/software/package/poppler/Config.in b/buildroot/package/poppler/Config.in
similarity index 100%
rename from software/package/poppler/Config.in
rename to buildroot/package/poppler/Config.in
diff --git a/software/package/poppler/poppler.hash b/buildroot/package/poppler/poppler.hash
similarity index 100%
rename from software/package/poppler/poppler.hash
rename to buildroot/package/poppler/poppler.hash
diff --git a/software/package/poppler/poppler.mk b/buildroot/package/poppler/poppler.mk
similarity index 100%
rename from software/package/poppler/poppler.mk
rename to buildroot/package/poppler/poppler.mk
diff --git a/software/package/popt/0001-no-wchar.patch b/buildroot/package/popt/0001-no-wchar.patch
similarity index 100%
rename from software/package/popt/0001-no-wchar.patch
rename to buildroot/package/popt/0001-no-wchar.patch
diff --git a/software/package/popt/0002-fix-autoreconf.patch b/buildroot/package/popt/0002-fix-autoreconf.patch
similarity index 100%
rename from software/package/popt/0002-fix-autoreconf.patch
rename to buildroot/package/popt/0002-fix-autoreconf.patch
diff --git a/software/package/popt/0003-glob-detection.patch b/buildroot/package/popt/0003-glob-detection.patch
similarity index 100%
rename from software/package/popt/0003-glob-detection.patch
rename to buildroot/package/popt/0003-glob-detection.patch
diff --git a/software/package/popt/0004-add-libiconv-to-popt.pc.patch b/buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch
similarity index 100%
rename from software/package/popt/0004-add-libiconv-to-popt.pc.patch
rename to buildroot/package/popt/0004-add-libiconv-to-popt.pc.patch
diff --git a/software/package/popt/Config.in b/buildroot/package/popt/Config.in
similarity index 100%
rename from software/package/popt/Config.in
rename to buildroot/package/popt/Config.in
diff --git a/software/package/popt/popt.hash b/buildroot/package/popt/popt.hash
similarity index 100%
rename from software/package/popt/popt.hash
rename to buildroot/package/popt/popt.hash
diff --git a/software/package/popt/popt.mk b/buildroot/package/popt/popt.mk
similarity index 100%
rename from software/package/popt/popt.mk
rename to buildroot/package/popt/popt.mk
diff --git a/software/package/portaudio/Config.in b/buildroot/package/portaudio/Config.in
similarity index 100%
rename from software/package/portaudio/Config.in
rename to buildroot/package/portaudio/Config.in
diff --git a/software/package/portaudio/portaudio.hash b/buildroot/package/portaudio/portaudio.hash
similarity index 100%
rename from software/package/portaudio/portaudio.hash
rename to buildroot/package/portaudio/portaudio.hash
diff --git a/software/package/portaudio/portaudio.mk b/buildroot/package/portaudio/portaudio.mk
similarity index 100%
rename from software/package/portaudio/portaudio.mk
rename to buildroot/package/portaudio/portaudio.mk
diff --git a/software/package/postgresql/Config.in b/buildroot/package/postgresql/Config.in
similarity index 100%
rename from software/package/postgresql/Config.in
rename to buildroot/package/postgresql/Config.in
diff --git a/software/package/postgresql/S50postgresql b/buildroot/package/postgresql/S50postgresql
similarity index 100%
rename from software/package/postgresql/S50postgresql
rename to buildroot/package/postgresql/S50postgresql
diff --git a/software/package/postgresql/pg_config b/buildroot/package/postgresql/pg_config
similarity index 100%
rename from software/package/postgresql/pg_config
rename to buildroot/package/postgresql/pg_config
diff --git a/software/package/postgresql/postgresql.hash b/buildroot/package/postgresql/postgresql.hash
similarity index 100%
rename from software/package/postgresql/postgresql.hash
rename to buildroot/package/postgresql/postgresql.hash
diff --git a/software/package/postgresql/postgresql.mk b/buildroot/package/postgresql/postgresql.mk
similarity index 100%
rename from software/package/postgresql/postgresql.mk
rename to buildroot/package/postgresql/postgresql.mk
diff --git a/software/package/postgresql/postgresql.service b/buildroot/package/postgresql/postgresql.service
similarity index 100%
rename from software/package/postgresql/postgresql.service
rename to buildroot/package/postgresql/postgresql.service
diff --git a/software/package/pound/0001-fix-openssl-1.0.2.patch b/buildroot/package/pound/0001-fix-openssl-1.0.2.patch
similarity index 100%
rename from software/package/pound/0001-fix-openssl-1.0.2.patch
rename to buildroot/package/pound/0001-fix-openssl-1.0.2.patch
diff --git a/software/package/pound/0002-fix-openssl-1.1.0.patch b/buildroot/package/pound/0002-fix-openssl-1.1.0.patch
similarity index 100%
rename from software/package/pound/0002-fix-openssl-1.1.0.patch
rename to buildroot/package/pound/0002-fix-openssl-1.1.0.patch
diff --git a/software/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch b/buildroot/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch
similarity index 100%
rename from software/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch
rename to buildroot/package/pound/0003-Support-for-libressl-coexisting-with-openssl-1.1.x.patch
diff --git a/software/package/pound/Config.in b/buildroot/package/pound/Config.in
similarity index 100%
rename from software/package/pound/Config.in
rename to buildroot/package/pound/Config.in
diff --git a/software/package/pound/pound.hash b/buildroot/package/pound/pound.hash
similarity index 100%
rename from software/package/pound/pound.hash
rename to buildroot/package/pound/pound.hash
diff --git a/software/package/pound/pound.mk b/buildroot/package/pound/pound.mk
similarity index 100%
rename from software/package/pound/pound.mk
rename to buildroot/package/pound/pound.mk
diff --git a/software/package/powerpc-utils/Config.in b/buildroot/package/powerpc-utils/Config.in
similarity index 100%
rename from software/package/powerpc-utils/Config.in
rename to buildroot/package/powerpc-utils/Config.in
diff --git a/software/package/powerpc-utils/powerpc-utils.hash b/buildroot/package/powerpc-utils/powerpc-utils.hash
similarity index 100%
rename from software/package/powerpc-utils/powerpc-utils.hash
rename to buildroot/package/powerpc-utils/powerpc-utils.hash
diff --git a/software/package/powerpc-utils/powerpc-utils.mk b/buildroot/package/powerpc-utils/powerpc-utils.mk
similarity index 100%
rename from software/package/powerpc-utils/powerpc-utils.mk
rename to buildroot/package/powerpc-utils/powerpc-utils.mk
diff --git a/software/package/powertop/0001-dont-force-stack-smashing-protection.patch b/buildroot/package/powertop/0001-dont-force-stack-smashing-protection.patch
similarity index 100%
rename from software/package/powertop/0001-dont-force-stack-smashing-protection.patch
rename to buildroot/package/powertop/0001-dont-force-stack-smashing-protection.patch
diff --git a/software/package/powertop/Config.in b/buildroot/package/powertop/Config.in
similarity index 100%
rename from software/package/powertop/Config.in
rename to buildroot/package/powertop/Config.in
diff --git a/software/package/powertop/powertop.hash b/buildroot/package/powertop/powertop.hash
similarity index 100%
rename from software/package/powertop/powertop.hash
rename to buildroot/package/powertop/powertop.hash
diff --git a/software/package/powertop/powertop.mk b/buildroot/package/powertop/powertop.mk
similarity index 100%
rename from software/package/powertop/powertop.mk
rename to buildroot/package/powertop/powertop.mk
diff --git a/software/package/powervr/Config.in b/buildroot/package/powervr/Config.in
similarity index 100%
rename from software/package/powervr/Config.in
rename to buildroot/package/powervr/Config.in
diff --git a/software/package/powervr/powervr.mk b/buildroot/package/powervr/powervr.mk
similarity index 100%
rename from software/package/powervr/powervr.mk
rename to buildroot/package/powervr/powervr.mk
diff --git a/software/package/pppd/0001-pppd-Fix-bounds-check.patch b/buildroot/package/pppd/0001-pppd-Fix-bounds-check.patch
similarity index 100%
rename from software/package/pppd/0001-pppd-Fix-bounds-check.patch
rename to buildroot/package/pppd/0001-pppd-Fix-bounds-check.patch
diff --git a/software/package/pppd/Config.in b/buildroot/package/pppd/Config.in
similarity index 100%
rename from software/package/pppd/Config.in
rename to buildroot/package/pppd/Config.in
diff --git a/software/package/pppd/pppd.hash b/buildroot/package/pppd/pppd.hash
similarity index 100%
rename from software/package/pppd/pppd.hash
rename to buildroot/package/pppd/pppd.hash
diff --git a/software/package/pppd/pppd.mk b/buildroot/package/pppd/pppd.mk
similarity index 100%
rename from software/package/pppd/pppd.mk
rename to buildroot/package/pppd/pppd.mk
diff --git a/software/package/pps-tools/Config.in b/buildroot/package/pps-tools/Config.in
similarity index 100%
rename from software/package/pps-tools/Config.in
rename to buildroot/package/pps-tools/Config.in
diff --git a/software/package/pps-tools/pps-tools.hash b/buildroot/package/pps-tools/pps-tools.hash
similarity index 100%
rename from software/package/pps-tools/pps-tools.hash
rename to buildroot/package/pps-tools/pps-tools.hash
diff --git a/software/package/pps-tools/pps-tools.mk b/buildroot/package/pps-tools/pps-tools.mk
similarity index 100%
rename from software/package/pps-tools/pps-tools.mk
rename to buildroot/package/pps-tools/pps-tools.mk
diff --git a/software/package/pptp-linux/0001-susv3-legacy.patch b/buildroot/package/pptp-linux/0001-susv3-legacy.patch
similarity index 100%
rename from software/package/pptp-linux/0001-susv3-legacy.patch
rename to buildroot/package/pptp-linux/0001-susv3-legacy.patch
diff --git a/software/package/pptp-linux/0002-fix-parallel-build.patch b/buildroot/package/pptp-linux/0002-fix-parallel-build.patch
similarity index 100%
rename from software/package/pptp-linux/0002-fix-parallel-build.patch
rename to buildroot/package/pptp-linux/0002-fix-parallel-build.patch
diff --git a/software/package/pptp-linux/Config.in b/buildroot/package/pptp-linux/Config.in
similarity index 100%
rename from software/package/pptp-linux/Config.in
rename to buildroot/package/pptp-linux/Config.in
diff --git a/software/package/pptp-linux/pptp-linux.hash b/buildroot/package/pptp-linux/pptp-linux.hash
similarity index 100%
rename from software/package/pptp-linux/pptp-linux.hash
rename to buildroot/package/pptp-linux/pptp-linux.hash
diff --git a/software/package/pptp-linux/pptp-linux.mk b/buildroot/package/pptp-linux/pptp-linux.mk
similarity index 100%
rename from software/package/pptp-linux/pptp-linux.mk
rename to buildroot/package/pptp-linux/pptp-linux.mk
diff --git a/software/package/prboom/0001-libpng-1.4.patch b/buildroot/package/prboom/0001-libpng-1.4.patch
similarity index 100%
rename from software/package/prboom/0001-libpng-1.4.patch
rename to buildroot/package/prboom/0001-libpng-1.4.patch
diff --git a/software/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch b/buildroot/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch
similarity index 100%
rename from software/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch
rename to buildroot/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch
diff --git a/software/package/prboom/Config.in b/buildroot/package/prboom/Config.in
similarity index 100%
rename from software/package/prboom/Config.in
rename to buildroot/package/prboom/Config.in
diff --git a/software/package/prboom/prboom.hash b/buildroot/package/prboom/prboom.hash
similarity index 100%
rename from software/package/prboom/prboom.hash
rename to buildroot/package/prboom/prboom.hash
diff --git a/software/package/prboom/prboom.mk b/buildroot/package/prboom/prboom.mk
similarity index 100%
rename from software/package/prboom/prboom.mk
rename to buildroot/package/prboom/prboom.mk
diff --git a/software/package/privoxy/Config.in b/buildroot/package/privoxy/Config.in
similarity index 100%
rename from software/package/privoxy/Config.in
rename to buildroot/package/privoxy/Config.in
diff --git a/software/package/privoxy/privoxy.hash b/buildroot/package/privoxy/privoxy.hash
similarity index 100%
rename from software/package/privoxy/privoxy.hash
rename to buildroot/package/privoxy/privoxy.hash
diff --git a/software/package/privoxy/privoxy.mk b/buildroot/package/privoxy/privoxy.mk
similarity index 100%
rename from software/package/privoxy/privoxy.mk
rename to buildroot/package/privoxy/privoxy.mk
diff --git a/software/package/procps-ng/Config.in b/buildroot/package/procps-ng/Config.in
similarity index 100%
rename from software/package/procps-ng/Config.in
rename to buildroot/package/procps-ng/Config.in
diff --git a/software/package/procps-ng/S02sysctl b/buildroot/package/procps-ng/S02sysctl
similarity index 100%
rename from software/package/procps-ng/S02sysctl
rename to buildroot/package/procps-ng/S02sysctl
diff --git a/software/package/procps-ng/procps-ng.hash b/buildroot/package/procps-ng/procps-ng.hash
similarity index 100%
rename from software/package/procps-ng/procps-ng.hash
rename to buildroot/package/procps-ng/procps-ng.hash
diff --git a/software/package/procps-ng/procps-ng.mk b/buildroot/package/procps-ng/procps-ng.mk
similarity index 100%
rename from software/package/procps-ng/procps-ng.mk
rename to buildroot/package/procps-ng/procps-ng.mk
diff --git a/software/package/procrank_linux/Config.in b/buildroot/package/procrank_linux/Config.in
similarity index 100%
rename from software/package/procrank_linux/Config.in
rename to buildroot/package/procrank_linux/Config.in
diff --git a/software/package/procrank_linux/procrank_linux.hash b/buildroot/package/procrank_linux/procrank_linux.hash
similarity index 100%
rename from software/package/procrank_linux/procrank_linux.hash
rename to buildroot/package/procrank_linux/procrank_linux.hash
diff --git a/software/package/procrank_linux/procrank_linux.mk b/buildroot/package/procrank_linux/procrank_linux.mk
similarity index 100%
rename from software/package/procrank_linux/procrank_linux.mk
rename to buildroot/package/procrank_linux/procrank_linux.mk
diff --git a/software/package/proftpd/Config.in b/buildroot/package/proftpd/Config.in
similarity index 100%
rename from software/package/proftpd/Config.in
rename to buildroot/package/proftpd/Config.in
diff --git a/software/package/proftpd/S50proftpd b/buildroot/package/proftpd/S50proftpd
similarity index 100%
rename from software/package/proftpd/S50proftpd
rename to buildroot/package/proftpd/S50proftpd
diff --git a/software/package/proftpd/proftpd.hash b/buildroot/package/proftpd/proftpd.hash
similarity index 100%
rename from software/package/proftpd/proftpd.hash
rename to buildroot/package/proftpd/proftpd.hash
diff --git a/software/package/proftpd/proftpd.mk b/buildroot/package/proftpd/proftpd.mk
similarity index 100%
rename from software/package/proftpd/proftpd.mk
rename to buildroot/package/proftpd/proftpd.mk
diff --git a/software/package/proftpd/proftpd.service b/buildroot/package/proftpd/proftpd.service
similarity index 100%
rename from software/package/proftpd/proftpd.service
rename to buildroot/package/proftpd/proftpd.service
diff --git a/software/package/proj/Config.in b/buildroot/package/proj/Config.in
similarity index 100%
rename from software/package/proj/Config.in
rename to buildroot/package/proj/Config.in
diff --git a/software/package/proj/proj.hash b/buildroot/package/proj/proj.hash
similarity index 100%
rename from software/package/proj/proj.hash
rename to buildroot/package/proj/proj.hash
diff --git a/software/package/proj/proj.mk b/buildroot/package/proj/proj.mk
similarity index 100%
rename from software/package/proj/proj.mk
rename to buildroot/package/proj/proj.mk
diff --git a/software/package/prosody/0001-enable-syslog.patch b/buildroot/package/prosody/0001-enable-syslog.patch
similarity index 100%
rename from software/package/prosody/0001-enable-syslog.patch
rename to buildroot/package/prosody/0001-enable-syslog.patch
diff --git a/software/package/prosody/0002-add-pidfile.patch b/buildroot/package/prosody/0002-add-pidfile.patch
similarity index 100%
rename from software/package/prosody/0002-add-pidfile.patch
rename to buildroot/package/prosody/0002-add-pidfile.patch
diff --git a/software/package/prosody/Config.in b/buildroot/package/prosody/Config.in
similarity index 100%
rename from software/package/prosody/Config.in
rename to buildroot/package/prosody/Config.in
diff --git a/software/package/prosody/S50prosody b/buildroot/package/prosody/S50prosody
similarity index 100%
rename from software/package/prosody/S50prosody
rename to buildroot/package/prosody/S50prosody
diff --git a/software/package/prosody/prosody.hash b/buildroot/package/prosody/prosody.hash
similarity index 100%
rename from software/package/prosody/prosody.hash
rename to buildroot/package/prosody/prosody.hash
diff --git a/software/package/prosody/prosody.mk b/buildroot/package/prosody/prosody.mk
similarity index 100%
rename from software/package/prosody/prosody.mk
rename to buildroot/package/prosody/prosody.mk
diff --git a/software/package/protobuf-c/Config.in b/buildroot/package/protobuf-c/Config.in
similarity index 100%
rename from software/package/protobuf-c/Config.in
rename to buildroot/package/protobuf-c/Config.in
diff --git a/software/package/protobuf-c/protobuf-c.hash b/buildroot/package/protobuf-c/protobuf-c.hash
similarity index 100%
rename from software/package/protobuf-c/protobuf-c.hash
rename to buildroot/package/protobuf-c/protobuf-c.hash
diff --git a/software/package/protobuf-c/protobuf-c.mk b/buildroot/package/protobuf-c/protobuf-c.mk
similarity index 100%
rename from software/package/protobuf-c/protobuf-c.mk
rename to buildroot/package/protobuf-c/protobuf-c.mk
diff --git a/software/package/protobuf/Config.in b/buildroot/package/protobuf/Config.in
similarity index 100%
rename from software/package/protobuf/Config.in
rename to buildroot/package/protobuf/Config.in
diff --git a/software/package/protobuf/protobuf.hash b/buildroot/package/protobuf/protobuf.hash
similarity index 100%
rename from software/package/protobuf/protobuf.hash
rename to buildroot/package/protobuf/protobuf.hash
diff --git a/software/package/protobuf/protobuf.mk b/buildroot/package/protobuf/protobuf.mk
similarity index 100%
rename from software/package/protobuf/protobuf.mk
rename to buildroot/package/protobuf/protobuf.mk
diff --git a/software/package/proxychains-ng/Config.in b/buildroot/package/proxychains-ng/Config.in
similarity index 100%
rename from software/package/proxychains-ng/Config.in
rename to buildroot/package/proxychains-ng/Config.in
diff --git a/software/package/proxychains-ng/proxychains-ng.hash b/buildroot/package/proxychains-ng/proxychains-ng.hash
similarity index 100%
rename from software/package/proxychains-ng/proxychains-ng.hash
rename to buildroot/package/proxychains-ng/proxychains-ng.hash
diff --git a/software/package/proxychains-ng/proxychains-ng.mk b/buildroot/package/proxychains-ng/proxychains-ng.mk
similarity index 100%
rename from software/package/proxychains-ng/proxychains-ng.mk
rename to buildroot/package/proxychains-ng/proxychains-ng.mk
diff --git a/software/package/pru-software-support/Config.in b/buildroot/package/pru-software-support/Config.in
similarity index 100%
rename from software/package/pru-software-support/Config.in
rename to buildroot/package/pru-software-support/Config.in
diff --git a/software/package/pru-software-support/Config.in.host b/buildroot/package/pru-software-support/Config.in.host
similarity index 100%
rename from software/package/pru-software-support/Config.in.host
rename to buildroot/package/pru-software-support/Config.in.host
diff --git a/software/package/pru-software-support/pru-software-support.hash b/buildroot/package/pru-software-support/pru-software-support.hash
similarity index 100%
rename from software/package/pru-software-support/pru-software-support.hash
rename to buildroot/package/pru-software-support/pru-software-support.hash
diff --git a/software/package/pru-software-support/pru-software-support.mk b/buildroot/package/pru-software-support/pru-software-support.mk
similarity index 100%
rename from software/package/pru-software-support/pru-software-support.mk
rename to buildroot/package/pru-software-support/pru-software-support.mk
diff --git a/software/package/pru-software-support/readme.txt b/buildroot/package/pru-software-support/readme.txt
similarity index 100%
rename from software/package/pru-software-support/readme.txt
rename to buildroot/package/pru-software-support/readme.txt
diff --git a/software/package/psmisc/Config.in b/buildroot/package/psmisc/Config.in
similarity index 100%
rename from software/package/psmisc/Config.in
rename to buildroot/package/psmisc/Config.in
diff --git a/software/package/psmisc/psmisc.hash b/buildroot/package/psmisc/psmisc.hash
similarity index 100%
rename from software/package/psmisc/psmisc.hash
rename to buildroot/package/psmisc/psmisc.hash
diff --git a/software/package/psmisc/psmisc.mk b/buildroot/package/psmisc/psmisc.mk
similarity index 100%
rename from software/package/psmisc/psmisc.mk
rename to buildroot/package/psmisc/psmisc.mk
diff --git a/software/package/psplash/Config.in b/buildroot/package/psplash/Config.in
similarity index 100%
rename from software/package/psplash/Config.in
rename to buildroot/package/psplash/Config.in
diff --git a/software/package/psplash/psplash-quit.service b/buildroot/package/psplash/psplash-quit.service
similarity index 100%
rename from software/package/psplash/psplash-quit.service
rename to buildroot/package/psplash/psplash-quit.service
diff --git a/software/package/psplash/psplash-start.service b/buildroot/package/psplash/psplash-start.service
similarity index 100%
rename from software/package/psplash/psplash-start.service
rename to buildroot/package/psplash/psplash-start.service
diff --git a/software/package/psplash/psplash.hash b/buildroot/package/psplash/psplash.hash
similarity index 100%
rename from software/package/psplash/psplash.hash
rename to buildroot/package/psplash/psplash.hash
diff --git a/software/package/psplash/psplash.mk b/buildroot/package/psplash/psplash.mk
similarity index 100%
rename from software/package/psplash/psplash.mk
rename to buildroot/package/psplash/psplash.mk
diff --git a/software/package/ptm2human/Config.in b/buildroot/package/ptm2human/Config.in
similarity index 100%
rename from software/package/ptm2human/Config.in
rename to buildroot/package/ptm2human/Config.in
diff --git a/software/package/ptm2human/ptm2human.hash b/buildroot/package/ptm2human/ptm2human.hash
similarity index 100%
rename from software/package/ptm2human/ptm2human.hash
rename to buildroot/package/ptm2human/ptm2human.hash
diff --git a/software/package/ptm2human/ptm2human.mk b/buildroot/package/ptm2human/ptm2human.mk
similarity index 100%
rename from software/package/ptm2human/ptm2human.mk
rename to buildroot/package/ptm2human/ptm2human.mk
diff --git a/software/package/ptpd/Config.in b/buildroot/package/ptpd/Config.in
similarity index 100%
rename from software/package/ptpd/Config.in
rename to buildroot/package/ptpd/Config.in
diff --git a/software/package/ptpd/S65ptpd b/buildroot/package/ptpd/S65ptpd
similarity index 100%
rename from software/package/ptpd/S65ptpd
rename to buildroot/package/ptpd/S65ptpd
diff --git a/software/package/ptpd/ptpd.hash b/buildroot/package/ptpd/ptpd.hash
similarity index 100%
rename from software/package/ptpd/ptpd.hash
rename to buildroot/package/ptpd/ptpd.hash
diff --git a/software/package/ptpd/ptpd.mk b/buildroot/package/ptpd/ptpd.mk
similarity index 100%
rename from software/package/ptpd/ptpd.mk
rename to buildroot/package/ptpd/ptpd.mk
diff --git a/software/package/ptpd/ptpd.service b/buildroot/package/ptpd/ptpd.service
similarity index 100%
rename from software/package/ptpd/ptpd.service
rename to buildroot/package/ptpd/ptpd.service
diff --git a/software/package/ptpd2/0001-musl.patch b/buildroot/package/ptpd2/0001-musl.patch
similarity index 100%
rename from software/package/ptpd2/0001-musl.patch
rename to buildroot/package/ptpd2/0001-musl.patch
diff --git a/software/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch b/buildroot/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch
similarity index 100%
rename from software/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch
rename to buildroot/package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch
diff --git a/software/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch b/buildroot/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch
similarity index 100%
rename from software/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch
rename to buildroot/package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch
diff --git a/software/package/ptpd2/Config.in b/buildroot/package/ptpd2/Config.in
similarity index 100%
rename from software/package/ptpd2/Config.in
rename to buildroot/package/ptpd2/Config.in
diff --git a/software/package/ptpd2/S65ptpd2 b/buildroot/package/ptpd2/S65ptpd2
similarity index 100%
rename from software/package/ptpd2/S65ptpd2
rename to buildroot/package/ptpd2/S65ptpd2
diff --git a/software/package/ptpd2/ptpd2.hash b/buildroot/package/ptpd2/ptpd2.hash
similarity index 100%
rename from software/package/ptpd2/ptpd2.hash
rename to buildroot/package/ptpd2/ptpd2.hash
diff --git a/software/package/ptpd2/ptpd2.mk b/buildroot/package/ptpd2/ptpd2.mk
similarity index 100%
rename from software/package/ptpd2/ptpd2.mk
rename to buildroot/package/ptpd2/ptpd2.mk
diff --git a/software/package/ptpd2/ptpd2.service b/buildroot/package/ptpd2/ptpd2.service
similarity index 100%
rename from software/package/ptpd2/ptpd2.service
rename to buildroot/package/ptpd2/ptpd2.service
diff --git a/software/package/pugixml/Config.in b/buildroot/package/pugixml/Config.in
similarity index 100%
rename from software/package/pugixml/Config.in
rename to buildroot/package/pugixml/Config.in
diff --git a/software/package/pugixml/pugixml.hash b/buildroot/package/pugixml/pugixml.hash
similarity index 100%
rename from software/package/pugixml/pugixml.hash
rename to buildroot/package/pugixml/pugixml.hash
diff --git a/software/package/pugixml/pugixml.mk b/buildroot/package/pugixml/pugixml.mk
similarity index 100%
rename from software/package/pugixml/pugixml.mk
rename to buildroot/package/pugixml/pugixml.mk
diff --git a/software/package/pulseaudio/Config.in b/buildroot/package/pulseaudio/Config.in
similarity index 100%
rename from software/package/pulseaudio/Config.in
rename to buildroot/package/pulseaudio/Config.in
diff --git a/software/package/pulseaudio/S50pulseaudio b/buildroot/package/pulseaudio/S50pulseaudio
similarity index 100%
rename from software/package/pulseaudio/S50pulseaudio
rename to buildroot/package/pulseaudio/S50pulseaudio
diff --git a/software/package/pulseaudio/pulseaudio.hash b/buildroot/package/pulseaudio/pulseaudio.hash
similarity index 100%
rename from software/package/pulseaudio/pulseaudio.hash
rename to buildroot/package/pulseaudio/pulseaudio.hash
diff --git a/software/package/pulseaudio/pulseaudio.mk b/buildroot/package/pulseaudio/pulseaudio.mk
similarity index 100%
rename from software/package/pulseaudio/pulseaudio.mk
rename to buildroot/package/pulseaudio/pulseaudio.mk
diff --git a/software/package/pulseaudio/pulseaudio.service b/buildroot/package/pulseaudio/pulseaudio.service
similarity index 100%
rename from software/package/pulseaudio/pulseaudio.service
rename to buildroot/package/pulseaudio/pulseaudio.service
diff --git a/software/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch b/buildroot/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
similarity index 100%
rename from software/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
rename to buildroot/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
diff --git a/software/package/pulseview/Config.in b/buildroot/package/pulseview/Config.in
similarity index 100%
rename from software/package/pulseview/Config.in
rename to buildroot/package/pulseview/Config.in
diff --git a/software/package/pulseview/pulseview.hash b/buildroot/package/pulseview/pulseview.hash
similarity index 100%
rename from software/package/pulseview/pulseview.hash
rename to buildroot/package/pulseview/pulseview.hash
diff --git a/software/package/pulseview/pulseview.mk b/buildroot/package/pulseview/pulseview.mk
similarity index 100%
rename from software/package/pulseview/pulseview.mk
rename to buildroot/package/pulseview/pulseview.mk
diff --git a/software/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch b/buildroot/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch
similarity index 100%
rename from software/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch
rename to buildroot/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch
diff --git a/software/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch b/buildroot/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch
similarity index 100%
rename from software/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch
rename to buildroot/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch
diff --git a/software/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch b/buildroot/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch
similarity index 100%
rename from software/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch
rename to buildroot/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch
diff --git a/software/package/pure-ftpd/Config.in b/buildroot/package/pure-ftpd/Config.in
similarity index 100%
rename from software/package/pure-ftpd/Config.in
rename to buildroot/package/pure-ftpd/Config.in
diff --git a/software/package/pure-ftpd/pure-ftpd.hash b/buildroot/package/pure-ftpd/pure-ftpd.hash
similarity index 100%
rename from software/package/pure-ftpd/pure-ftpd.hash
rename to buildroot/package/pure-ftpd/pure-ftpd.hash
diff --git a/software/package/pure-ftpd/pure-ftpd.mk b/buildroot/package/pure-ftpd/pure-ftpd.mk
similarity index 100%
rename from software/package/pure-ftpd/pure-ftpd.mk
rename to buildroot/package/pure-ftpd/pure-ftpd.mk
diff --git a/software/package/putty/Config.in b/buildroot/package/putty/Config.in
similarity index 100%
rename from software/package/putty/Config.in
rename to buildroot/package/putty/Config.in
diff --git a/software/package/putty/putty.hash b/buildroot/package/putty/putty.hash
similarity index 100%
rename from software/package/putty/putty.hash
rename to buildroot/package/putty/putty.hash
diff --git a/software/package/putty/putty.mk b/buildroot/package/putty/putty.mk
similarity index 100%
rename from software/package/putty/putty.mk
rename to buildroot/package/putty/putty.mk
diff --git a/software/package/pv/0001-configure.in-tighten-AIX-test.patch b/buildroot/package/pv/0001-configure.in-tighten-AIX-test.patch
similarity index 100%
rename from software/package/pv/0001-configure.in-tighten-AIX-test.patch
rename to buildroot/package/pv/0001-configure.in-tighten-AIX-test.patch
diff --git a/software/package/pv/Config.in b/buildroot/package/pv/Config.in
similarity index 100%
rename from software/package/pv/Config.in
rename to buildroot/package/pv/Config.in
diff --git a/software/package/pv/pv.hash b/buildroot/package/pv/pv.hash
similarity index 100%
rename from software/package/pv/pv.hash
rename to buildroot/package/pv/pv.hash
diff --git a/software/package/pv/pv.mk b/buildroot/package/pv/pv.mk
similarity index 100%
rename from software/package/pv/pv.mk
rename to buildroot/package/pv/pv.mk
diff --git a/software/package/pwgen/Config.in b/buildroot/package/pwgen/Config.in
similarity index 100%
rename from software/package/pwgen/Config.in
rename to buildroot/package/pwgen/Config.in
diff --git a/software/package/pwgen/Config.in.host b/buildroot/package/pwgen/Config.in.host
similarity index 100%
rename from software/package/pwgen/Config.in.host
rename to buildroot/package/pwgen/Config.in.host
diff --git a/software/package/pwgen/pwgen.hash b/buildroot/package/pwgen/pwgen.hash
similarity index 100%
rename from software/package/pwgen/pwgen.hash
rename to buildroot/package/pwgen/pwgen.hash
diff --git a/software/package/pwgen/pwgen.mk b/buildroot/package/pwgen/pwgen.mk
similarity index 100%
rename from software/package/pwgen/pwgen.mk
rename to buildroot/package/pwgen/pwgen.mk
diff --git a/software/package/python-aenum/Config.in b/buildroot/package/python-aenum/Config.in
similarity index 100%
rename from software/package/python-aenum/Config.in
rename to buildroot/package/python-aenum/Config.in
diff --git a/software/package/python-aenum/python-aenum.hash b/buildroot/package/python-aenum/python-aenum.hash
similarity index 100%
rename from software/package/python-aenum/python-aenum.hash
rename to buildroot/package/python-aenum/python-aenum.hash
diff --git a/software/package/python-aenum/python-aenum.mk b/buildroot/package/python-aenum/python-aenum.mk
similarity index 100%
rename from software/package/python-aenum/python-aenum.mk
rename to buildroot/package/python-aenum/python-aenum.mk
diff --git a/software/package/python-aioblescan/Config.in b/buildroot/package/python-aioblescan/Config.in
similarity index 100%
rename from software/package/python-aioblescan/Config.in
rename to buildroot/package/python-aioblescan/Config.in
diff --git a/software/package/python-aioblescan/python-aioblescan.hash b/buildroot/package/python-aioblescan/python-aioblescan.hash
similarity index 100%
rename from software/package/python-aioblescan/python-aioblescan.hash
rename to buildroot/package/python-aioblescan/python-aioblescan.hash
diff --git a/software/package/python-aioblescan/python-aioblescan.mk b/buildroot/package/python-aioblescan/python-aioblescan.mk
similarity index 100%
rename from software/package/python-aioblescan/python-aioblescan.mk
rename to buildroot/package/python-aioblescan/python-aioblescan.mk
diff --git a/software/package/python-aiocoap/Config.in b/buildroot/package/python-aiocoap/Config.in
similarity index 100%
rename from software/package/python-aiocoap/Config.in
rename to buildroot/package/python-aiocoap/Config.in
diff --git a/software/package/python-aiocoap/python-aiocoap.hash b/buildroot/package/python-aiocoap/python-aiocoap.hash
similarity index 100%
rename from software/package/python-aiocoap/python-aiocoap.hash
rename to buildroot/package/python-aiocoap/python-aiocoap.hash
diff --git a/software/package/python-aiocoap/python-aiocoap.mk b/buildroot/package/python-aiocoap/python-aiocoap.mk
similarity index 100%
rename from software/package/python-aiocoap/python-aiocoap.mk
rename to buildroot/package/python-aiocoap/python-aiocoap.mk
diff --git a/software/package/python-aioconsole/Config.in b/buildroot/package/python-aioconsole/Config.in
similarity index 100%
rename from software/package/python-aioconsole/Config.in
rename to buildroot/package/python-aioconsole/Config.in
diff --git a/software/package/python-aioconsole/python-aioconsole.hash b/buildroot/package/python-aioconsole/python-aioconsole.hash
similarity index 100%
rename from software/package/python-aioconsole/python-aioconsole.hash
rename to buildroot/package/python-aioconsole/python-aioconsole.hash
diff --git a/software/package/python-aioconsole/python-aioconsole.mk b/buildroot/package/python-aioconsole/python-aioconsole.mk
similarity index 100%
rename from software/package/python-aioconsole/python-aioconsole.mk
rename to buildroot/package/python-aioconsole/python-aioconsole.mk
diff --git a/software/package/python-aiodns/Config.in b/buildroot/package/python-aiodns/Config.in
similarity index 100%
rename from software/package/python-aiodns/Config.in
rename to buildroot/package/python-aiodns/Config.in
diff --git a/software/package/python-aiodns/python-aiodns.hash b/buildroot/package/python-aiodns/python-aiodns.hash
similarity index 100%
rename from software/package/python-aiodns/python-aiodns.hash
rename to buildroot/package/python-aiodns/python-aiodns.hash
diff --git a/software/package/python-aiodns/python-aiodns.mk b/buildroot/package/python-aiodns/python-aiodns.mk
similarity index 100%
rename from software/package/python-aiodns/python-aiodns.mk
rename to buildroot/package/python-aiodns/python-aiodns.mk
diff --git a/software/package/python-aiohttp-cors/Config.in b/buildroot/package/python-aiohttp-cors/Config.in
similarity index 100%
rename from software/package/python-aiohttp-cors/Config.in
rename to buildroot/package/python-aiohttp-cors/Config.in
diff --git a/software/package/python-aiohttp-cors/python-aiohttp-cors.hash b/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.hash
similarity index 100%
rename from software/package/python-aiohttp-cors/python-aiohttp-cors.hash
rename to buildroot/package/python-aiohttp-cors/python-aiohttp-cors.hash
diff --git a/software/package/python-aiohttp-cors/python-aiohttp-cors.mk b/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.mk
similarity index 100%
rename from software/package/python-aiohttp-cors/python-aiohttp-cors.mk
rename to buildroot/package/python-aiohttp-cors/python-aiohttp-cors.mk
diff --git a/software/package/python-aiohttp-debugtoolbar/Config.in b/buildroot/package/python-aiohttp-debugtoolbar/Config.in
similarity index 100%
rename from software/package/python-aiohttp-debugtoolbar/Config.in
rename to buildroot/package/python-aiohttp-debugtoolbar/Config.in
diff --git a/software/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash b/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash
similarity index 100%
rename from software/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash
rename to buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash
diff --git a/software/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk b/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk
similarity index 100%
rename from software/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk
rename to buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk
diff --git a/software/package/python-aiohttp-jinja2/Config.in b/buildroot/package/python-aiohttp-jinja2/Config.in
similarity index 100%
rename from software/package/python-aiohttp-jinja2/Config.in
rename to buildroot/package/python-aiohttp-jinja2/Config.in
diff --git a/software/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash
similarity index 100%
rename from software/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash
rename to buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash
diff --git a/software/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk
similarity index 100%
rename from software/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk
rename to buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk
diff --git a/software/package/python-aiohttp-mako/Config.in b/buildroot/package/python-aiohttp-mako/Config.in
similarity index 100%
rename from software/package/python-aiohttp-mako/Config.in
rename to buildroot/package/python-aiohttp-mako/Config.in
diff --git a/software/package/python-aiohttp-mako/python-aiohttp-mako.hash b/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.hash
similarity index 100%
rename from software/package/python-aiohttp-mako/python-aiohttp-mako.hash
rename to buildroot/package/python-aiohttp-mako/python-aiohttp-mako.hash
diff --git a/software/package/python-aiohttp-mako/python-aiohttp-mako.mk b/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.mk
similarity index 100%
rename from software/package/python-aiohttp-mako/python-aiohttp-mako.mk
rename to buildroot/package/python-aiohttp-mako/python-aiohttp-mako.mk
diff --git a/software/package/python-aiohttp-remotes/Config.in b/buildroot/package/python-aiohttp-remotes/Config.in
similarity index 100%
rename from software/package/python-aiohttp-remotes/Config.in
rename to buildroot/package/python-aiohttp-remotes/Config.in
diff --git a/software/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash
similarity index 100%
rename from software/package/python-aiohttp-remotes/python-aiohttp-remotes.hash
rename to buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash
diff --git a/software/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk
similarity index 100%
rename from software/package/python-aiohttp-remotes/python-aiohttp-remotes.mk
rename to buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk
diff --git a/software/package/python-aiohttp-security/Config.in b/buildroot/package/python-aiohttp-security/Config.in
similarity index 100%
rename from software/package/python-aiohttp-security/Config.in
rename to buildroot/package/python-aiohttp-security/Config.in
diff --git a/software/package/python-aiohttp-security/python-aiohttp-security.hash b/buildroot/package/python-aiohttp-security/python-aiohttp-security.hash
similarity index 100%
rename from software/package/python-aiohttp-security/python-aiohttp-security.hash
rename to buildroot/package/python-aiohttp-security/python-aiohttp-security.hash
diff --git a/software/package/python-aiohttp-security/python-aiohttp-security.mk b/buildroot/package/python-aiohttp-security/python-aiohttp-security.mk
similarity index 100%
rename from software/package/python-aiohttp-security/python-aiohttp-security.mk
rename to buildroot/package/python-aiohttp-security/python-aiohttp-security.mk
diff --git a/software/package/python-aiohttp-session/Config.in b/buildroot/package/python-aiohttp-session/Config.in
similarity index 100%
rename from software/package/python-aiohttp-session/Config.in
rename to buildroot/package/python-aiohttp-session/Config.in
diff --git a/software/package/python-aiohttp-session/python-aiohttp-session.hash b/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash
similarity index 100%
rename from software/package/python-aiohttp-session/python-aiohttp-session.hash
rename to buildroot/package/python-aiohttp-session/python-aiohttp-session.hash
diff --git a/software/package/python-aiohttp-session/python-aiohttp-session.mk b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk
similarity index 100%
rename from software/package/python-aiohttp-session/python-aiohttp-session.mk
rename to buildroot/package/python-aiohttp-session/python-aiohttp-session.mk
diff --git a/software/package/python-aiohttp-sse/Config.in b/buildroot/package/python-aiohttp-sse/Config.in
similarity index 100%
rename from software/package/python-aiohttp-sse/Config.in
rename to buildroot/package/python-aiohttp-sse/Config.in
diff --git a/software/package/python-aiohttp-sse/python-aiohttp-sse.hash b/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.hash
similarity index 100%
rename from software/package/python-aiohttp-sse/python-aiohttp-sse.hash
rename to buildroot/package/python-aiohttp-sse/python-aiohttp-sse.hash
diff --git a/software/package/python-aiohttp-sse/python-aiohttp-sse.mk b/buildroot/package/python-aiohttp-sse/python-aiohttp-sse.mk
similarity index 100%
rename from software/package/python-aiohttp-sse/python-aiohttp-sse.mk
rename to buildroot/package/python-aiohttp-sse/python-aiohttp-sse.mk
diff --git a/software/package/python-aiohttp/Config.in b/buildroot/package/python-aiohttp/Config.in
similarity index 100%
rename from software/package/python-aiohttp/Config.in
rename to buildroot/package/python-aiohttp/Config.in
diff --git a/software/package/python-aiohttp/python-aiohttp.hash b/buildroot/package/python-aiohttp/python-aiohttp.hash
similarity index 100%
rename from software/package/python-aiohttp/python-aiohttp.hash
rename to buildroot/package/python-aiohttp/python-aiohttp.hash
diff --git a/software/package/python-aiohttp/python-aiohttp.mk b/buildroot/package/python-aiohttp/python-aiohttp.mk
similarity index 100%
rename from software/package/python-aiohttp/python-aiohttp.mk
rename to buildroot/package/python-aiohttp/python-aiohttp.mk
diff --git a/software/package/python-aiojobs/Config.in b/buildroot/package/python-aiojobs/Config.in
similarity index 100%
rename from software/package/python-aiojobs/Config.in
rename to buildroot/package/python-aiojobs/Config.in
diff --git a/software/package/python-aiojobs/python-aiojobs.hash b/buildroot/package/python-aiojobs/python-aiojobs.hash
similarity index 100%
rename from software/package/python-aiojobs/python-aiojobs.hash
rename to buildroot/package/python-aiojobs/python-aiojobs.hash
diff --git a/software/package/python-aiojobs/python-aiojobs.mk b/buildroot/package/python-aiojobs/python-aiojobs.mk
similarity index 100%
rename from software/package/python-aiojobs/python-aiojobs.mk
rename to buildroot/package/python-aiojobs/python-aiojobs.mk
diff --git a/software/package/python-aiologstash/Config.in b/buildroot/package/python-aiologstash/Config.in
similarity index 100%
rename from software/package/python-aiologstash/Config.in
rename to buildroot/package/python-aiologstash/Config.in
diff --git a/software/package/python-aiologstash/python-aiologstash.hash b/buildroot/package/python-aiologstash/python-aiologstash.hash
similarity index 100%
rename from software/package/python-aiologstash/python-aiologstash.hash
rename to buildroot/package/python-aiologstash/python-aiologstash.hash
diff --git a/software/package/python-aiologstash/python-aiologstash.mk b/buildroot/package/python-aiologstash/python-aiologstash.mk
similarity index 100%
rename from software/package/python-aiologstash/python-aiologstash.mk
rename to buildroot/package/python-aiologstash/python-aiologstash.mk
diff --git a/software/package/python-aiomonitor/Config.in b/buildroot/package/python-aiomonitor/Config.in
similarity index 100%
rename from software/package/python-aiomonitor/Config.in
rename to buildroot/package/python-aiomonitor/Config.in
diff --git a/software/package/python-aiomonitor/python-aiomonitor.hash b/buildroot/package/python-aiomonitor/python-aiomonitor.hash
similarity index 100%
rename from software/package/python-aiomonitor/python-aiomonitor.hash
rename to buildroot/package/python-aiomonitor/python-aiomonitor.hash
diff --git a/software/package/python-aiomonitor/python-aiomonitor.mk b/buildroot/package/python-aiomonitor/python-aiomonitor.mk
similarity index 100%
rename from software/package/python-aiomonitor/python-aiomonitor.mk
rename to buildroot/package/python-aiomonitor/python-aiomonitor.mk
diff --git a/software/package/python-aioredis/Config.in b/buildroot/package/python-aioredis/Config.in
similarity index 100%
rename from software/package/python-aioredis/Config.in
rename to buildroot/package/python-aioredis/Config.in
diff --git a/software/package/python-aioredis/python-aioredis.hash b/buildroot/package/python-aioredis/python-aioredis.hash
similarity index 100%
rename from software/package/python-aioredis/python-aioredis.hash
rename to buildroot/package/python-aioredis/python-aioredis.hash
diff --git a/software/package/python-aioredis/python-aioredis.mk b/buildroot/package/python-aioredis/python-aioredis.mk
similarity index 100%
rename from software/package/python-aioredis/python-aioredis.mk
rename to buildroot/package/python-aioredis/python-aioredis.mk
diff --git a/software/package/python-aiorwlock/Config.in b/buildroot/package/python-aiorwlock/Config.in
similarity index 100%
rename from software/package/python-aiorwlock/Config.in
rename to buildroot/package/python-aiorwlock/Config.in
diff --git a/software/package/python-aiorwlock/python-aiorwlock.hash b/buildroot/package/python-aiorwlock/python-aiorwlock.hash
similarity index 100%
rename from software/package/python-aiorwlock/python-aiorwlock.hash
rename to buildroot/package/python-aiorwlock/python-aiorwlock.hash
diff --git a/software/package/python-aiorwlock/python-aiorwlock.mk b/buildroot/package/python-aiorwlock/python-aiorwlock.mk
similarity index 100%
rename from software/package/python-aiorwlock/python-aiorwlock.mk
rename to buildroot/package/python-aiorwlock/python-aiorwlock.mk
diff --git a/software/package/python-aiosignal/Config.in b/buildroot/package/python-aiosignal/Config.in
similarity index 100%
rename from software/package/python-aiosignal/Config.in
rename to buildroot/package/python-aiosignal/Config.in
diff --git a/software/package/python-aiosignal/python-aiosignal.hash b/buildroot/package/python-aiosignal/python-aiosignal.hash
similarity index 100%
rename from software/package/python-aiosignal/python-aiosignal.hash
rename to buildroot/package/python-aiosignal/python-aiosignal.hash
diff --git a/software/package/python-aiosignal/python-aiosignal.mk b/buildroot/package/python-aiosignal/python-aiosignal.mk
similarity index 100%
rename from software/package/python-aiosignal/python-aiosignal.mk
rename to buildroot/package/python-aiosignal/python-aiosignal.mk
diff --git a/software/package/python-aiozipkin/Config.in b/buildroot/package/python-aiozipkin/Config.in
similarity index 100%
rename from software/package/python-aiozipkin/Config.in
rename to buildroot/package/python-aiozipkin/Config.in
diff --git a/software/package/python-aiozipkin/python-aiozipkin.hash b/buildroot/package/python-aiozipkin/python-aiozipkin.hash
similarity index 100%
rename from software/package/python-aiozipkin/python-aiozipkin.hash
rename to buildroot/package/python-aiozipkin/python-aiozipkin.hash
diff --git a/software/package/python-aiozipkin/python-aiozipkin.mk b/buildroot/package/python-aiozipkin/python-aiozipkin.mk
similarity index 100%
rename from software/package/python-aiozipkin/python-aiozipkin.mk
rename to buildroot/package/python-aiozipkin/python-aiozipkin.mk
diff --git a/software/package/python-alsaaudio/Config.in b/buildroot/package/python-alsaaudio/Config.in
similarity index 100%
rename from software/package/python-alsaaudio/Config.in
rename to buildroot/package/python-alsaaudio/Config.in
diff --git a/software/package/python-alsaaudio/python-alsaaudio.hash b/buildroot/package/python-alsaaudio/python-alsaaudio.hash
similarity index 100%
rename from software/package/python-alsaaudio/python-alsaaudio.hash
rename to buildroot/package/python-alsaaudio/python-alsaaudio.hash
diff --git a/software/package/python-alsaaudio/python-alsaaudio.mk b/buildroot/package/python-alsaaudio/python-alsaaudio.mk
similarity index 100%
rename from software/package/python-alsaaudio/python-alsaaudio.mk
rename to buildroot/package/python-alsaaudio/python-alsaaudio.mk
diff --git a/software/package/python-argh/Config.in b/buildroot/package/python-argh/Config.in
similarity index 100%
rename from software/package/python-argh/Config.in
rename to buildroot/package/python-argh/Config.in
diff --git a/software/package/python-argh/python-argh.hash b/buildroot/package/python-argh/python-argh.hash
similarity index 100%
rename from software/package/python-argh/python-argh.hash
rename to buildroot/package/python-argh/python-argh.hash
diff --git a/software/package/python-argh/python-argh.mk b/buildroot/package/python-argh/python-argh.mk
similarity index 100%
rename from software/package/python-argh/python-argh.mk
rename to buildroot/package/python-argh/python-argh.mk
diff --git a/software/package/python-arrow/Config.in b/buildroot/package/python-arrow/Config.in
similarity index 100%
rename from software/package/python-arrow/Config.in
rename to buildroot/package/python-arrow/Config.in
diff --git a/software/package/python-arrow/python-arrow.hash b/buildroot/package/python-arrow/python-arrow.hash
similarity index 100%
rename from software/package/python-arrow/python-arrow.hash
rename to buildroot/package/python-arrow/python-arrow.hash
diff --git a/software/package/python-arrow/python-arrow.mk b/buildroot/package/python-arrow/python-arrow.mk
similarity index 100%
rename from software/package/python-arrow/python-arrow.mk
rename to buildroot/package/python-arrow/python-arrow.mk
diff --git a/software/package/python-asgiref/Config.in b/buildroot/package/python-asgiref/Config.in
similarity index 100%
rename from software/package/python-asgiref/Config.in
rename to buildroot/package/python-asgiref/Config.in
diff --git a/software/package/python-asgiref/python-asgiref.hash b/buildroot/package/python-asgiref/python-asgiref.hash
similarity index 100%
rename from software/package/python-asgiref/python-asgiref.hash
rename to buildroot/package/python-asgiref/python-asgiref.hash
diff --git a/software/package/python-asgiref/python-asgiref.mk b/buildroot/package/python-asgiref/python-asgiref.mk
similarity index 100%
rename from software/package/python-asgiref/python-asgiref.mk
rename to buildroot/package/python-asgiref/python-asgiref.mk
diff --git a/software/package/python-asn1crypto/Config.in b/buildroot/package/python-asn1crypto/Config.in
similarity index 100%
rename from software/package/python-asn1crypto/Config.in
rename to buildroot/package/python-asn1crypto/Config.in
diff --git a/software/package/python-asn1crypto/python-asn1crypto.hash b/buildroot/package/python-asn1crypto/python-asn1crypto.hash
similarity index 100%
rename from software/package/python-asn1crypto/python-asn1crypto.hash
rename to buildroot/package/python-asn1crypto/python-asn1crypto.hash
diff --git a/software/package/python-asn1crypto/python-asn1crypto.mk b/buildroot/package/python-asn1crypto/python-asn1crypto.mk
similarity index 100%
rename from software/package/python-asn1crypto/python-asn1crypto.mk
rename to buildroot/package/python-asn1crypto/python-asn1crypto.mk
diff --git a/software/package/python-async-lru/Config.in b/buildroot/package/python-async-lru/Config.in
similarity index 100%
rename from software/package/python-async-lru/Config.in
rename to buildroot/package/python-async-lru/Config.in
diff --git a/software/package/python-async-lru/python-async-lru.hash b/buildroot/package/python-async-lru/python-async-lru.hash
similarity index 100%
rename from software/package/python-async-lru/python-async-lru.hash
rename to buildroot/package/python-async-lru/python-async-lru.hash
diff --git a/software/package/python-async-lru/python-async-lru.mk b/buildroot/package/python-async-lru/python-async-lru.mk
similarity index 100%
rename from software/package/python-async-lru/python-async-lru.mk
rename to buildroot/package/python-async-lru/python-async-lru.mk
diff --git a/software/package/python-async-timeout/Config.in b/buildroot/package/python-async-timeout/Config.in
similarity index 100%
rename from software/package/python-async-timeout/Config.in
rename to buildroot/package/python-async-timeout/Config.in
diff --git a/software/package/python-async-timeout/python-async-timeout.hash b/buildroot/package/python-async-timeout/python-async-timeout.hash
similarity index 100%
rename from software/package/python-async-timeout/python-async-timeout.hash
rename to buildroot/package/python-async-timeout/python-async-timeout.hash
diff --git a/software/package/python-async-timeout/python-async-timeout.mk b/buildroot/package/python-async-timeout/python-async-timeout.mk
similarity index 100%
rename from software/package/python-async-timeout/python-async-timeout.mk
rename to buildroot/package/python-async-timeout/python-async-timeout.mk
diff --git a/software/package/python-attrs/Config.in b/buildroot/package/python-attrs/Config.in
similarity index 100%
rename from software/package/python-attrs/Config.in
rename to buildroot/package/python-attrs/Config.in
diff --git a/software/package/python-attrs/python-attrs.hash b/buildroot/package/python-attrs/python-attrs.hash
similarity index 100%
rename from software/package/python-attrs/python-attrs.hash
rename to buildroot/package/python-attrs/python-attrs.hash
diff --git a/software/package/python-attrs/python-attrs.mk b/buildroot/package/python-attrs/python-attrs.mk
similarity index 100%
rename from software/package/python-attrs/python-attrs.mk
rename to buildroot/package/python-attrs/python-attrs.mk
diff --git a/software/package/python-autobahn/Config.in b/buildroot/package/python-autobahn/Config.in
similarity index 100%
rename from software/package/python-autobahn/Config.in
rename to buildroot/package/python-autobahn/Config.in
diff --git a/software/package/python-autobahn/python-autobahn.hash b/buildroot/package/python-autobahn/python-autobahn.hash
similarity index 100%
rename from software/package/python-autobahn/python-autobahn.hash
rename to buildroot/package/python-autobahn/python-autobahn.hash
diff --git a/software/package/python-autobahn/python-autobahn.mk b/buildroot/package/python-autobahn/python-autobahn.mk
similarity index 100%
rename from software/package/python-autobahn/python-autobahn.mk
rename to buildroot/package/python-autobahn/python-autobahn.mk
diff --git a/software/package/python-automat/Config.in b/buildroot/package/python-automat/Config.in
similarity index 100%
rename from software/package/python-automat/Config.in
rename to buildroot/package/python-automat/Config.in
diff --git a/software/package/python-automat/python-automat.hash b/buildroot/package/python-automat/python-automat.hash
similarity index 100%
rename from software/package/python-automat/python-automat.hash
rename to buildroot/package/python-automat/python-automat.hash
diff --git a/software/package/python-automat/python-automat.mk b/buildroot/package/python-automat/python-automat.mk
similarity index 100%
rename from software/package/python-automat/python-automat.mk
rename to buildroot/package/python-automat/python-automat.mk
diff --git a/software/package/python-avro/Config.in b/buildroot/package/python-avro/Config.in
similarity index 100%
rename from software/package/python-avro/Config.in
rename to buildroot/package/python-avro/Config.in
diff --git a/software/package/python-avro/python-avro.hash b/buildroot/package/python-avro/python-avro.hash
similarity index 100%
rename from software/package/python-avro/python-avro.hash
rename to buildroot/package/python-avro/python-avro.hash
diff --git a/software/package/python-avro/python-avro.mk b/buildroot/package/python-avro/python-avro.mk
similarity index 100%
rename from software/package/python-avro/python-avro.mk
rename to buildroot/package/python-avro/python-avro.mk
diff --git a/software/package/python-babel/Config.in b/buildroot/package/python-babel/Config.in
similarity index 100%
rename from software/package/python-babel/Config.in
rename to buildroot/package/python-babel/Config.in
diff --git a/software/package/python-babel/python-babel.hash b/buildroot/package/python-babel/python-babel.hash
similarity index 100%
rename from software/package/python-babel/python-babel.hash
rename to buildroot/package/python-babel/python-babel.hash
diff --git a/software/package/python-babel/python-babel.mk b/buildroot/package/python-babel/python-babel.mk
similarity index 100%
rename from software/package/python-babel/python-babel.mk
rename to buildroot/package/python-babel/python-babel.mk
diff --git a/software/package/python-backcall/Config.in b/buildroot/package/python-backcall/Config.in
similarity index 100%
rename from software/package/python-backcall/Config.in
rename to buildroot/package/python-backcall/Config.in
diff --git a/software/package/python-backcall/python-backcall.hash b/buildroot/package/python-backcall/python-backcall.hash
similarity index 100%
rename from software/package/python-backcall/python-backcall.hash
rename to buildroot/package/python-backcall/python-backcall.hash
diff --git a/software/package/python-backcall/python-backcall.mk b/buildroot/package/python-backcall/python-backcall.mk
similarity index 100%
rename from software/package/python-backcall/python-backcall.mk
rename to buildroot/package/python-backcall/python-backcall.mk
diff --git a/software/package/python-backports-abc/Config.in b/buildroot/package/python-backports-abc/Config.in
similarity index 100%
rename from software/package/python-backports-abc/Config.in
rename to buildroot/package/python-backports-abc/Config.in
diff --git a/software/package/python-backports-abc/python-backports-abc.hash b/buildroot/package/python-backports-abc/python-backports-abc.hash
similarity index 100%
rename from software/package/python-backports-abc/python-backports-abc.hash
rename to buildroot/package/python-backports-abc/python-backports-abc.hash
diff --git a/software/package/python-backports-abc/python-backports-abc.mk b/buildroot/package/python-backports-abc/python-backports-abc.mk
similarity index 100%
rename from software/package/python-backports-abc/python-backports-abc.mk
rename to buildroot/package/python-backports-abc/python-backports-abc.mk
diff --git a/software/package/python-backports-functools-lru-cache/Config.in b/buildroot/package/python-backports-functools-lru-cache/Config.in
similarity index 100%
rename from software/package/python-backports-functools-lru-cache/Config.in
rename to buildroot/package/python-backports-functools-lru-cache/Config.in
diff --git a/software/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash b/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash
similarity index 100%
rename from software/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash
rename to buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash
diff --git a/software/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk b/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk
similarity index 100%
rename from software/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk
rename to buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk
diff --git a/software/package/python-backports-shutil-get-terminal-size/Config.in b/buildroot/package/python-backports-shutil-get-terminal-size/Config.in
similarity index 100%
rename from software/package/python-backports-shutil-get-terminal-size/Config.in
rename to buildroot/package/python-backports-shutil-get-terminal-size/Config.in
diff --git a/software/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
similarity index 100%
rename from software/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
rename to buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
diff --git a/software/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
similarity index 100%
rename from software/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
rename to buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
diff --git a/software/package/python-backports-ssl-match-hostname/Config.in b/buildroot/package/python-backports-ssl-match-hostname/Config.in
similarity index 100%
rename from software/package/python-backports-ssl-match-hostname/Config.in
rename to buildroot/package/python-backports-ssl-match-hostname/Config.in
diff --git a/software/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
similarity index 100%
rename from software/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
rename to buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash
diff --git a/software/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk
similarity index 100%
rename from software/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk
rename to buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk
diff --git a/software/package/python-bcrypt/Config.in b/buildroot/package/python-bcrypt/Config.in
similarity index 100%
rename from software/package/python-bcrypt/Config.in
rename to buildroot/package/python-bcrypt/Config.in
diff --git a/software/package/python-bcrypt/python-bcrypt.hash b/buildroot/package/python-bcrypt/python-bcrypt.hash
similarity index 100%
rename from software/package/python-bcrypt/python-bcrypt.hash
rename to buildroot/package/python-bcrypt/python-bcrypt.hash
diff --git a/software/package/python-bcrypt/python-bcrypt.mk b/buildroot/package/python-bcrypt/python-bcrypt.mk
similarity index 100%
rename from software/package/python-bcrypt/python-bcrypt.mk
rename to buildroot/package/python-bcrypt/python-bcrypt.mk
diff --git a/software/package/python-beautifulsoup4/Config.in b/buildroot/package/python-beautifulsoup4/Config.in
similarity index 100%
rename from software/package/python-beautifulsoup4/Config.in
rename to buildroot/package/python-beautifulsoup4/Config.in
diff --git a/software/package/python-beautifulsoup4/python-beautifulsoup4.hash b/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash
similarity index 100%
rename from software/package/python-beautifulsoup4/python-beautifulsoup4.hash
rename to buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash
diff --git a/software/package/python-beautifulsoup4/python-beautifulsoup4.mk b/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk
similarity index 100%
rename from software/package/python-beautifulsoup4/python-beautifulsoup4.mk
rename to buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk
diff --git a/software/package/python-bitstring/Config.in b/buildroot/package/python-bitstring/Config.in
similarity index 100%
rename from software/package/python-bitstring/Config.in
rename to buildroot/package/python-bitstring/Config.in
diff --git a/software/package/python-bitstring/python-bitstring.hash b/buildroot/package/python-bitstring/python-bitstring.hash
similarity index 100%
rename from software/package/python-bitstring/python-bitstring.hash
rename to buildroot/package/python-bitstring/python-bitstring.hash
diff --git a/software/package/python-bitstring/python-bitstring.mk b/buildroot/package/python-bitstring/python-bitstring.mk
similarity index 100%
rename from software/package/python-bitstring/python-bitstring.mk
rename to buildroot/package/python-bitstring/python-bitstring.mk
diff --git a/software/package/python-bluezero/Config.in b/buildroot/package/python-bluezero/Config.in
similarity index 100%
rename from software/package/python-bluezero/Config.in
rename to buildroot/package/python-bluezero/Config.in
diff --git a/software/package/python-bluezero/python-bluezero.hash b/buildroot/package/python-bluezero/python-bluezero.hash
similarity index 100%
rename from software/package/python-bluezero/python-bluezero.hash
rename to buildroot/package/python-bluezero/python-bluezero.hash
diff --git a/software/package/python-bluezero/python-bluezero.mk b/buildroot/package/python-bluezero/python-bluezero.mk
similarity index 100%
rename from software/package/python-bluezero/python-bluezero.mk
rename to buildroot/package/python-bluezero/python-bluezero.mk
diff --git a/software/package/python-bottle/Config.in b/buildroot/package/python-bottle/Config.in
similarity index 100%
rename from software/package/python-bottle/Config.in
rename to buildroot/package/python-bottle/Config.in
diff --git a/software/package/python-bottle/python-bottle.hash b/buildroot/package/python-bottle/python-bottle.hash
similarity index 100%
rename from software/package/python-bottle/python-bottle.hash
rename to buildroot/package/python-bottle/python-bottle.hash
diff --git a/software/package/python-bottle/python-bottle.mk b/buildroot/package/python-bottle/python-bottle.mk
similarity index 100%
rename from software/package/python-bottle/python-bottle.mk
rename to buildroot/package/python-bottle/python-bottle.mk
diff --git a/software/package/python-brotli/Config.in b/buildroot/package/python-brotli/Config.in
similarity index 100%
rename from software/package/python-brotli/Config.in
rename to buildroot/package/python-brotli/Config.in
diff --git a/software/package/python-brotli/python-brotli.hash b/buildroot/package/python-brotli/python-brotli.hash
similarity index 100%
rename from software/package/python-brotli/python-brotli.hash
rename to buildroot/package/python-brotli/python-brotli.hash
diff --git a/software/package/python-brotli/python-brotli.mk b/buildroot/package/python-brotli/python-brotli.mk
similarity index 100%
rename from software/package/python-brotli/python-brotli.mk
rename to buildroot/package/python-brotli/python-brotli.mk
diff --git a/software/package/python-bunch/Config.in b/buildroot/package/python-bunch/Config.in
similarity index 100%
rename from software/package/python-bunch/Config.in
rename to buildroot/package/python-bunch/Config.in
diff --git a/software/package/python-bunch/python-bunch.hash b/buildroot/package/python-bunch/python-bunch.hash
similarity index 100%
rename from software/package/python-bunch/python-bunch.hash
rename to buildroot/package/python-bunch/python-bunch.hash
diff --git a/software/package/python-bunch/python-bunch.mk b/buildroot/package/python-bunch/python-bunch.mk
similarity index 100%
rename from software/package/python-bunch/python-bunch.mk
rename to buildroot/package/python-bunch/python-bunch.mk
diff --git a/software/package/python-cached-property/Config.in b/buildroot/package/python-cached-property/Config.in
similarity index 100%
rename from software/package/python-cached-property/Config.in
rename to buildroot/package/python-cached-property/Config.in
diff --git a/software/package/python-cached-property/python-cached-property.hash b/buildroot/package/python-cached-property/python-cached-property.hash
similarity index 100%
rename from software/package/python-cached-property/python-cached-property.hash
rename to buildroot/package/python-cached-property/python-cached-property.hash
diff --git a/software/package/python-cached-property/python-cached-property.mk b/buildroot/package/python-cached-property/python-cached-property.mk
similarity index 100%
rename from software/package/python-cached-property/python-cached-property.mk
rename to buildroot/package/python-cached-property/python-cached-property.mk
diff --git a/software/package/python-can/Config.in b/buildroot/package/python-can/Config.in
similarity index 100%
rename from software/package/python-can/Config.in
rename to buildroot/package/python-can/Config.in
diff --git a/software/package/python-can/python-can.hash b/buildroot/package/python-can/python-can.hash
similarity index 100%
rename from software/package/python-can/python-can.hash
rename to buildroot/package/python-can/python-can.hash
diff --git a/software/package/python-can/python-can.mk b/buildroot/package/python-can/python-can.mk
similarity index 100%
rename from software/package/python-can/python-can.mk
rename to buildroot/package/python-can/python-can.mk
diff --git a/software/package/python-cbor/Config.in b/buildroot/package/python-cbor/Config.in
similarity index 100%
rename from software/package/python-cbor/Config.in
rename to buildroot/package/python-cbor/Config.in
diff --git a/software/package/python-cbor/python-cbor.hash b/buildroot/package/python-cbor/python-cbor.hash
similarity index 100%
rename from software/package/python-cbor/python-cbor.hash
rename to buildroot/package/python-cbor/python-cbor.hash
diff --git a/software/package/python-cbor/python-cbor.mk b/buildroot/package/python-cbor/python-cbor.mk
similarity index 100%
rename from software/package/python-cbor/python-cbor.mk
rename to buildroot/package/python-cbor/python-cbor.mk
diff --git a/software/package/python-cchardet/Config.in b/buildroot/package/python-cchardet/Config.in
similarity index 100%
rename from software/package/python-cchardet/Config.in
rename to buildroot/package/python-cchardet/Config.in
diff --git a/software/package/python-cchardet/python-cchardet.hash b/buildroot/package/python-cchardet/python-cchardet.hash
similarity index 100%
rename from software/package/python-cchardet/python-cchardet.hash
rename to buildroot/package/python-cchardet/python-cchardet.hash
diff --git a/software/package/python-cchardet/python-cchardet.mk b/buildroot/package/python-cchardet/python-cchardet.mk
similarity index 100%
rename from software/package/python-cchardet/python-cchardet.mk
rename to buildroot/package/python-cchardet/python-cchardet.mk
diff --git a/software/package/python-certifi/Config.in b/buildroot/package/python-certifi/Config.in
similarity index 100%
rename from software/package/python-certifi/Config.in
rename to buildroot/package/python-certifi/Config.in
diff --git a/software/package/python-certifi/python-certifi.hash b/buildroot/package/python-certifi/python-certifi.hash
similarity index 100%
rename from software/package/python-certifi/python-certifi.hash
rename to buildroot/package/python-certifi/python-certifi.hash
diff --git a/software/package/python-certifi/python-certifi.mk b/buildroot/package/python-certifi/python-certifi.mk
similarity index 100%
rename from software/package/python-certifi/python-certifi.mk
rename to buildroot/package/python-certifi/python-certifi.mk
diff --git a/software/package/python-cffi/Config.in b/buildroot/package/python-cffi/Config.in
similarity index 100%
rename from software/package/python-cffi/Config.in
rename to buildroot/package/python-cffi/Config.in
diff --git a/software/package/python-cffi/python-cffi.hash b/buildroot/package/python-cffi/python-cffi.hash
similarity index 100%
rename from software/package/python-cffi/python-cffi.hash
rename to buildroot/package/python-cffi/python-cffi.hash
diff --git a/software/package/python-cffi/python-cffi.mk b/buildroot/package/python-cffi/python-cffi.mk
similarity index 100%
rename from software/package/python-cffi/python-cffi.mk
rename to buildroot/package/python-cffi/python-cffi.mk
diff --git a/software/package/python-channels-redis/Config.in b/buildroot/package/python-channels-redis/Config.in
similarity index 100%
rename from software/package/python-channels-redis/Config.in
rename to buildroot/package/python-channels-redis/Config.in
diff --git a/software/package/python-channels-redis/python-channels-redis.hash b/buildroot/package/python-channels-redis/python-channels-redis.hash
similarity index 100%
rename from software/package/python-channels-redis/python-channels-redis.hash
rename to buildroot/package/python-channels-redis/python-channels-redis.hash
diff --git a/software/package/python-channels-redis/python-channels-redis.mk b/buildroot/package/python-channels-redis/python-channels-redis.mk
similarity index 100%
rename from software/package/python-channels-redis/python-channels-redis.mk
rename to buildroot/package/python-channels-redis/python-channels-redis.mk
diff --git a/software/package/python-channels/Config.in b/buildroot/package/python-channels/Config.in
similarity index 100%
rename from software/package/python-channels/Config.in
rename to buildroot/package/python-channels/Config.in
diff --git a/software/package/python-channels/python-channels.hash b/buildroot/package/python-channels/python-channels.hash
similarity index 100%
rename from software/package/python-channels/python-channels.hash
rename to buildroot/package/python-channels/python-channels.hash
diff --git a/software/package/python-channels/python-channels.mk b/buildroot/package/python-channels/python-channels.mk
similarity index 100%
rename from software/package/python-channels/python-channels.mk
rename to buildroot/package/python-channels/python-channels.mk
diff --git a/software/package/python-characteristic/Config.in b/buildroot/package/python-characteristic/Config.in
similarity index 100%
rename from software/package/python-characteristic/Config.in
rename to buildroot/package/python-characteristic/Config.in
diff --git a/software/package/python-characteristic/python-characteristic.hash b/buildroot/package/python-characteristic/python-characteristic.hash
similarity index 100%
rename from software/package/python-characteristic/python-characteristic.hash
rename to buildroot/package/python-characteristic/python-characteristic.hash
diff --git a/software/package/python-characteristic/python-characteristic.mk b/buildroot/package/python-characteristic/python-characteristic.mk
similarity index 100%
rename from software/package/python-characteristic/python-characteristic.mk
rename to buildroot/package/python-characteristic/python-characteristic.mk
diff --git a/software/package/python-chardet/Config.in b/buildroot/package/python-chardet/Config.in
similarity index 100%
rename from software/package/python-chardet/Config.in
rename to buildroot/package/python-chardet/Config.in
diff --git a/software/package/python-chardet/python-chardet.hash b/buildroot/package/python-chardet/python-chardet.hash
similarity index 100%
rename from software/package/python-chardet/python-chardet.hash
rename to buildroot/package/python-chardet/python-chardet.hash
diff --git a/software/package/python-chardet/python-chardet.mk b/buildroot/package/python-chardet/python-chardet.mk
similarity index 100%
rename from software/package/python-chardet/python-chardet.mk
rename to buildroot/package/python-chardet/python-chardet.mk
diff --git a/software/package/python-cheetah/Config.in b/buildroot/package/python-cheetah/Config.in
similarity index 100%
rename from software/package/python-cheetah/Config.in
rename to buildroot/package/python-cheetah/Config.in
diff --git a/software/package/python-cheetah/python-cheetah.hash b/buildroot/package/python-cheetah/python-cheetah.hash
similarity index 100%
rename from software/package/python-cheetah/python-cheetah.hash
rename to buildroot/package/python-cheetah/python-cheetah.hash
diff --git a/software/package/python-cheetah/python-cheetah.mk b/buildroot/package/python-cheetah/python-cheetah.mk
similarity index 100%
rename from software/package/python-cheetah/python-cheetah.mk
rename to buildroot/package/python-cheetah/python-cheetah.mk
diff --git a/software/package/python-cheroot/Config.in b/buildroot/package/python-cheroot/Config.in
similarity index 100%
rename from software/package/python-cheroot/Config.in
rename to buildroot/package/python-cheroot/Config.in
diff --git a/software/package/python-cheroot/python-cheroot.hash b/buildroot/package/python-cheroot/python-cheroot.hash
similarity index 100%
rename from software/package/python-cheroot/python-cheroot.hash
rename to buildroot/package/python-cheroot/python-cheroot.hash
diff --git a/software/package/python-cheroot/python-cheroot.mk b/buildroot/package/python-cheroot/python-cheroot.mk
similarity index 100%
rename from software/package/python-cheroot/python-cheroot.mk
rename to buildroot/package/python-cheroot/python-cheroot.mk
diff --git a/software/package/python-cherrypy/Config.in b/buildroot/package/python-cherrypy/Config.in
similarity index 100%
rename from software/package/python-cherrypy/Config.in
rename to buildroot/package/python-cherrypy/Config.in
diff --git a/software/package/python-cherrypy/python-cherrypy.hash b/buildroot/package/python-cherrypy/python-cherrypy.hash
similarity index 100%
rename from software/package/python-cherrypy/python-cherrypy.hash
rename to buildroot/package/python-cherrypy/python-cherrypy.hash
diff --git a/software/package/python-cherrypy/python-cherrypy.mk b/buildroot/package/python-cherrypy/python-cherrypy.mk
similarity index 100%
rename from software/package/python-cherrypy/python-cherrypy.mk
rename to buildroot/package/python-cherrypy/python-cherrypy.mk
diff --git a/software/package/python-click/Config.in b/buildroot/package/python-click/Config.in
similarity index 100%
rename from software/package/python-click/Config.in
rename to buildroot/package/python-click/Config.in
diff --git a/software/package/python-click/python-click.hash b/buildroot/package/python-click/python-click.hash
similarity index 100%
rename from software/package/python-click/python-click.hash
rename to buildroot/package/python-click/python-click.hash
diff --git a/software/package/python-click/python-click.mk b/buildroot/package/python-click/python-click.mk
similarity index 100%
rename from software/package/python-click/python-click.mk
rename to buildroot/package/python-click/python-click.mk
diff --git a/software/package/python-coherence/0001-Fix-twisted-detection.patch b/buildroot/package/python-coherence/0001-Fix-twisted-detection.patch
similarity index 100%
rename from software/package/python-coherence/0001-Fix-twisted-detection.patch
rename to buildroot/package/python-coherence/0001-Fix-twisted-detection.patch
diff --git a/software/package/python-coherence/Config.in b/buildroot/package/python-coherence/Config.in
similarity index 100%
rename from software/package/python-coherence/Config.in
rename to buildroot/package/python-coherence/Config.in
diff --git a/software/package/python-coherence/python-coherence.hash b/buildroot/package/python-coherence/python-coherence.hash
similarity index 100%
rename from software/package/python-coherence/python-coherence.hash
rename to buildroot/package/python-coherence/python-coherence.hash
diff --git a/software/package/python-coherence/python-coherence.mk b/buildroot/package/python-coherence/python-coherence.mk
similarity index 100%
rename from software/package/python-coherence/python-coherence.mk
rename to buildroot/package/python-coherence/python-coherence.mk
diff --git a/software/package/python-colorama/Config.in b/buildroot/package/python-colorama/Config.in
similarity index 100%
rename from software/package/python-colorama/Config.in
rename to buildroot/package/python-colorama/Config.in
diff --git a/software/package/python-colorama/python-colorama.hash b/buildroot/package/python-colorama/python-colorama.hash
similarity index 100%
rename from software/package/python-colorama/python-colorama.hash
rename to buildroot/package/python-colorama/python-colorama.hash
diff --git a/software/package/python-colorama/python-colorama.mk b/buildroot/package/python-colorama/python-colorama.mk
similarity index 100%
rename from software/package/python-colorama/python-colorama.mk
rename to buildroot/package/python-colorama/python-colorama.mk
diff --git a/software/package/python-colorlog/Config.in b/buildroot/package/python-colorlog/Config.in
similarity index 100%
rename from software/package/python-colorlog/Config.in
rename to buildroot/package/python-colorlog/Config.in
diff --git a/software/package/python-colorlog/python-colorlog.hash b/buildroot/package/python-colorlog/python-colorlog.hash
similarity index 100%
rename from software/package/python-colorlog/python-colorlog.hash
rename to buildroot/package/python-colorlog/python-colorlog.hash
diff --git a/software/package/python-colorlog/python-colorlog.mk b/buildroot/package/python-colorlog/python-colorlog.mk
similarity index 100%
rename from software/package/python-colorlog/python-colorlog.mk
rename to buildroot/package/python-colorlog/python-colorlog.mk
diff --git a/software/package/python-configobj/Config.in b/buildroot/package/python-configobj/Config.in
similarity index 100%
rename from software/package/python-configobj/Config.in
rename to buildroot/package/python-configobj/Config.in
diff --git a/software/package/python-configobj/python-configobj.hash b/buildroot/package/python-configobj/python-configobj.hash
similarity index 100%
rename from software/package/python-configobj/python-configobj.hash
rename to buildroot/package/python-configobj/python-configobj.hash
diff --git a/software/package/python-configobj/python-configobj.mk b/buildroot/package/python-configobj/python-configobj.mk
similarity index 100%
rename from software/package/python-configobj/python-configobj.mk
rename to buildroot/package/python-configobj/python-configobj.mk
diff --git a/software/package/python-configshell-fb/Config.in b/buildroot/package/python-configshell-fb/Config.in
similarity index 100%
rename from software/package/python-configshell-fb/Config.in
rename to buildroot/package/python-configshell-fb/Config.in
diff --git a/software/package/python-configshell-fb/python-configshell-fb.hash b/buildroot/package/python-configshell-fb/python-configshell-fb.hash
similarity index 100%
rename from software/package/python-configshell-fb/python-configshell-fb.hash
rename to buildroot/package/python-configshell-fb/python-configshell-fb.hash
diff --git a/software/package/python-configshell-fb/python-configshell-fb.mk b/buildroot/package/python-configshell-fb/python-configshell-fb.mk
similarity index 100%
rename from software/package/python-configshell-fb/python-configshell-fb.mk
rename to buildroot/package/python-configshell-fb/python-configshell-fb.mk
diff --git a/software/package/python-constantly/Config.in b/buildroot/package/python-constantly/Config.in
similarity index 100%
rename from software/package/python-constantly/Config.in
rename to buildroot/package/python-constantly/Config.in
diff --git a/software/package/python-constantly/python-constantly.hash b/buildroot/package/python-constantly/python-constantly.hash
similarity index 100%
rename from software/package/python-constantly/python-constantly.hash
rename to buildroot/package/python-constantly/python-constantly.hash
diff --git a/software/package/python-constantly/python-constantly.mk b/buildroot/package/python-constantly/python-constantly.mk
similarity index 100%
rename from software/package/python-constantly/python-constantly.mk
rename to buildroot/package/python-constantly/python-constantly.mk
diff --git a/software/package/python-couchdb/Config.in b/buildroot/package/python-couchdb/Config.in
similarity index 100%
rename from software/package/python-couchdb/Config.in
rename to buildroot/package/python-couchdb/Config.in
diff --git a/software/package/python-couchdb/python-couchdb.hash b/buildroot/package/python-couchdb/python-couchdb.hash
similarity index 100%
rename from software/package/python-couchdb/python-couchdb.hash
rename to buildroot/package/python-couchdb/python-couchdb.hash
diff --git a/software/package/python-couchdb/python-couchdb.mk b/buildroot/package/python-couchdb/python-couchdb.mk
similarity index 100%
rename from software/package/python-couchdb/python-couchdb.mk
rename to buildroot/package/python-couchdb/python-couchdb.mk
diff --git a/software/package/python-crc16/Config.in b/buildroot/package/python-crc16/Config.in
similarity index 100%
rename from software/package/python-crc16/Config.in
rename to buildroot/package/python-crc16/Config.in
diff --git a/software/package/python-crc16/python-crc16.hash b/buildroot/package/python-crc16/python-crc16.hash
similarity index 100%
rename from software/package/python-crc16/python-crc16.hash
rename to buildroot/package/python-crc16/python-crc16.hash
diff --git a/software/package/python-crc16/python-crc16.mk b/buildroot/package/python-crc16/python-crc16.mk
similarity index 100%
rename from software/package/python-crc16/python-crc16.mk
rename to buildroot/package/python-crc16/python-crc16.mk
diff --git a/software/package/python-crcmod/Config.in b/buildroot/package/python-crcmod/Config.in
similarity index 100%
rename from software/package/python-crcmod/Config.in
rename to buildroot/package/python-crcmod/Config.in
diff --git a/software/package/python-crcmod/python-crcmod.hash b/buildroot/package/python-crcmod/python-crcmod.hash
similarity index 100%
rename from software/package/python-crcmod/python-crcmod.hash
rename to buildroot/package/python-crcmod/python-crcmod.hash
diff --git a/software/package/python-crcmod/python-crcmod.mk b/buildroot/package/python-crcmod/python-crcmod.mk
similarity index 100%
rename from software/package/python-crcmod/python-crcmod.mk
rename to buildroot/package/python-crcmod/python-crcmod.mk
diff --git a/software/package/python-crontab/Config.in b/buildroot/package/python-crontab/Config.in
similarity index 100%
rename from software/package/python-crontab/Config.in
rename to buildroot/package/python-crontab/Config.in
diff --git a/software/package/python-crontab/python-crontab.hash b/buildroot/package/python-crontab/python-crontab.hash
similarity index 100%
rename from software/package/python-crontab/python-crontab.hash
rename to buildroot/package/python-crontab/python-crontab.hash
diff --git a/software/package/python-crontab/python-crontab.mk b/buildroot/package/python-crontab/python-crontab.mk
similarity index 100%
rename from software/package/python-crontab/python-crontab.mk
rename to buildroot/package/python-crontab/python-crontab.mk
diff --git a/software/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch b/buildroot/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch
similarity index 100%
rename from software/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch
rename to buildroot/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch
diff --git a/software/package/python-crossbar/0002-Remove-idna-requirement.patch b/buildroot/package/python-crossbar/0002-Remove-idna-requirement.patch
similarity index 100%
rename from software/package/python-crossbar/0002-Remove-idna-requirement.patch
rename to buildroot/package/python-crossbar/0002-Remove-idna-requirement.patch
diff --git a/software/package/python-crossbar/Config.in b/buildroot/package/python-crossbar/Config.in
similarity index 100%
rename from software/package/python-crossbar/Config.in
rename to buildroot/package/python-crossbar/Config.in
diff --git a/software/package/python-crossbar/python-crossbar.hash b/buildroot/package/python-crossbar/python-crossbar.hash
similarity index 100%
rename from software/package/python-crossbar/python-crossbar.hash
rename to buildroot/package/python-crossbar/python-crossbar.hash
diff --git a/software/package/python-crossbar/python-crossbar.mk b/buildroot/package/python-crossbar/python-crossbar.mk
similarity index 100%
rename from software/package/python-crossbar/python-crossbar.mk
rename to buildroot/package/python-crossbar/python-crossbar.mk
diff --git a/software/package/python-cryptography/Config.in b/buildroot/package/python-cryptography/Config.in
similarity index 100%
rename from software/package/python-cryptography/Config.in
rename to buildroot/package/python-cryptography/Config.in
diff --git a/software/package/python-cryptography/python-cryptography.hash b/buildroot/package/python-cryptography/python-cryptography.hash
similarity index 100%
rename from software/package/python-cryptography/python-cryptography.hash
rename to buildroot/package/python-cryptography/python-cryptography.hash
diff --git a/software/package/python-cryptography/python-cryptography.mk b/buildroot/package/python-cryptography/python-cryptography.mk
similarity index 100%
rename from software/package/python-cryptography/python-cryptography.mk
rename to buildroot/package/python-cryptography/python-cryptography.mk
diff --git a/software/package/python-cssselect/Config.in b/buildroot/package/python-cssselect/Config.in
similarity index 100%
rename from software/package/python-cssselect/Config.in
rename to buildroot/package/python-cssselect/Config.in
diff --git a/software/package/python-cssselect/python-cssselect.hash b/buildroot/package/python-cssselect/python-cssselect.hash
similarity index 100%
rename from software/package/python-cssselect/python-cssselect.hash
rename to buildroot/package/python-cssselect/python-cssselect.hash
diff --git a/software/package/python-cssselect/python-cssselect.mk b/buildroot/package/python-cssselect/python-cssselect.mk
similarity index 100%
rename from software/package/python-cssselect/python-cssselect.mk
rename to buildroot/package/python-cssselect/python-cssselect.mk
diff --git a/software/package/python-cssutils/Config.in b/buildroot/package/python-cssutils/Config.in
similarity index 100%
rename from software/package/python-cssutils/Config.in
rename to buildroot/package/python-cssutils/Config.in
diff --git a/software/package/python-cssutils/python-cssutils.hash b/buildroot/package/python-cssutils/python-cssutils.hash
similarity index 100%
rename from software/package/python-cssutils/python-cssutils.hash
rename to buildroot/package/python-cssutils/python-cssutils.hash
diff --git a/software/package/python-cssutils/python-cssutils.mk b/buildroot/package/python-cssutils/python-cssutils.mk
similarity index 100%
rename from software/package/python-cssutils/python-cssutils.mk
rename to buildroot/package/python-cssutils/python-cssutils.mk
diff --git a/software/package/python-cycler/Config.in b/buildroot/package/python-cycler/Config.in
similarity index 100%
rename from software/package/python-cycler/Config.in
rename to buildroot/package/python-cycler/Config.in
diff --git a/software/package/python-cycler/python-cycler.hash b/buildroot/package/python-cycler/python-cycler.hash
similarity index 100%
rename from software/package/python-cycler/python-cycler.hash
rename to buildroot/package/python-cycler/python-cycler.hash
diff --git a/software/package/python-cycler/python-cycler.mk b/buildroot/package/python-cycler/python-cycler.mk
similarity index 100%
rename from software/package/python-cycler/python-cycler.mk
rename to buildroot/package/python-cycler/python-cycler.mk
diff --git a/software/package/python-cython/Config.in.host b/buildroot/package/python-cython/Config.in.host
similarity index 100%
rename from software/package/python-cython/Config.in.host
rename to buildroot/package/python-cython/Config.in.host
diff --git a/software/package/python-cython/python-cython.hash b/buildroot/package/python-cython/python-cython.hash
similarity index 100%
rename from software/package/python-cython/python-cython.hash
rename to buildroot/package/python-cython/python-cython.hash
diff --git a/software/package/python-cython/python-cython.mk b/buildroot/package/python-cython/python-cython.mk
similarity index 100%
rename from software/package/python-cython/python-cython.mk
rename to buildroot/package/python-cython/python-cython.mk
diff --git a/software/package/python-daemon/Config.in b/buildroot/package/python-daemon/Config.in
similarity index 100%
rename from software/package/python-daemon/Config.in
rename to buildroot/package/python-daemon/Config.in
diff --git a/software/package/python-daemon/python-daemon.hash b/buildroot/package/python-daemon/python-daemon.hash
similarity index 100%
rename from software/package/python-daemon/python-daemon.hash
rename to buildroot/package/python-daemon/python-daemon.hash
diff --git a/software/package/python-daemon/python-daemon.mk b/buildroot/package/python-daemon/python-daemon.mk
similarity index 100%
rename from software/package/python-daemon/python-daemon.mk
rename to buildroot/package/python-daemon/python-daemon.mk
diff --git a/software/package/python-daemonize/Config.in b/buildroot/package/python-daemonize/Config.in
similarity index 100%
rename from software/package/python-daemonize/Config.in
rename to buildroot/package/python-daemonize/Config.in
diff --git a/software/package/python-daemonize/python-daemonize.hash b/buildroot/package/python-daemonize/python-daemonize.hash
similarity index 100%
rename from software/package/python-daemonize/python-daemonize.hash
rename to buildroot/package/python-daemonize/python-daemonize.hash
diff --git a/software/package/python-daemonize/python-daemonize.mk b/buildroot/package/python-daemonize/python-daemonize.mk
similarity index 100%
rename from software/package/python-daemonize/python-daemonize.mk
rename to buildroot/package/python-daemonize/python-daemonize.mk
diff --git a/software/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/buildroot/package/python-daphne/0001-remove-pytest-runner-requirement.patch
similarity index 100%
rename from software/package/python-daphne/0001-remove-pytest-runner-requirement.patch
rename to buildroot/package/python-daphne/0001-remove-pytest-runner-requirement.patch
diff --git a/software/package/python-daphne/Config.in b/buildroot/package/python-daphne/Config.in
similarity index 100%
rename from software/package/python-daphne/Config.in
rename to buildroot/package/python-daphne/Config.in
diff --git a/software/package/python-daphne/python-daphne.hash b/buildroot/package/python-daphne/python-daphne.hash
similarity index 100%
rename from software/package/python-daphne/python-daphne.hash
rename to buildroot/package/python-daphne/python-daphne.hash
diff --git a/software/package/python-daphne/python-daphne.mk b/buildroot/package/python-daphne/python-daphne.mk
similarity index 100%
rename from software/package/python-daphne/python-daphne.mk
rename to buildroot/package/python-daphne/python-daphne.mk
diff --git a/software/package/python-dataproperty/Config.in b/buildroot/package/python-dataproperty/Config.in
similarity index 100%
rename from software/package/python-dataproperty/Config.in
rename to buildroot/package/python-dataproperty/Config.in
diff --git a/software/package/python-dataproperty/python-dataproperty.hash b/buildroot/package/python-dataproperty/python-dataproperty.hash
similarity index 100%
rename from software/package/python-dataproperty/python-dataproperty.hash
rename to buildroot/package/python-dataproperty/python-dataproperty.hash
diff --git a/software/package/python-dataproperty/python-dataproperty.mk b/buildroot/package/python-dataproperty/python-dataproperty.mk
similarity index 100%
rename from software/package/python-dataproperty/python-dataproperty.mk
rename to buildroot/package/python-dataproperty/python-dataproperty.mk
diff --git a/software/package/python-dateutil/Config.in b/buildroot/package/python-dateutil/Config.in
similarity index 100%
rename from software/package/python-dateutil/Config.in
rename to buildroot/package/python-dateutil/Config.in
diff --git a/software/package/python-dateutil/python-dateutil.hash b/buildroot/package/python-dateutil/python-dateutil.hash
similarity index 100%
rename from software/package/python-dateutil/python-dateutil.hash
rename to buildroot/package/python-dateutil/python-dateutil.hash
diff --git a/software/package/python-dateutil/python-dateutil.mk b/buildroot/package/python-dateutil/python-dateutil.mk
similarity index 100%
rename from software/package/python-dateutil/python-dateutil.mk
rename to buildroot/package/python-dateutil/python-dateutil.mk
diff --git a/software/package/python-decorator/Config.in b/buildroot/package/python-decorator/Config.in
similarity index 100%
rename from software/package/python-decorator/Config.in
rename to buildroot/package/python-decorator/Config.in
diff --git a/software/package/python-decorator/python-decorator.hash b/buildroot/package/python-decorator/python-decorator.hash
similarity index 100%
rename from software/package/python-decorator/python-decorator.hash
rename to buildroot/package/python-decorator/python-decorator.hash
diff --git a/software/package/python-decorator/python-decorator.mk b/buildroot/package/python-decorator/python-decorator.mk
similarity index 100%
rename from software/package/python-decorator/python-decorator.mk
rename to buildroot/package/python-decorator/python-decorator.mk
diff --git a/software/package/python-dialog/Config.in b/buildroot/package/python-dialog/Config.in
similarity index 100%
rename from software/package/python-dialog/Config.in
rename to buildroot/package/python-dialog/Config.in
diff --git a/software/package/python-dialog/python-dialog.hash b/buildroot/package/python-dialog/python-dialog.hash
similarity index 100%
rename from software/package/python-dialog/python-dialog.hash
rename to buildroot/package/python-dialog/python-dialog.hash
diff --git a/software/package/python-dialog/python-dialog.mk b/buildroot/package/python-dialog/python-dialog.mk
similarity index 100%
rename from software/package/python-dialog/python-dialog.mk
rename to buildroot/package/python-dialog/python-dialog.mk
diff --git a/software/package/python-dialog3/Config.in b/buildroot/package/python-dialog3/Config.in
similarity index 100%
rename from software/package/python-dialog3/Config.in
rename to buildroot/package/python-dialog3/Config.in
diff --git a/software/package/python-dialog3/python-dialog3.hash b/buildroot/package/python-dialog3/python-dialog3.hash
similarity index 100%
rename from software/package/python-dialog3/python-dialog3.hash
rename to buildroot/package/python-dialog3/python-dialog3.hash
diff --git a/software/package/python-dialog3/python-dialog3.mk b/buildroot/package/python-dialog3/python-dialog3.mk
similarity index 100%
rename from software/package/python-dialog3/python-dialog3.mk
rename to buildroot/package/python-dialog3/python-dialog3.mk
diff --git a/software/package/python-dicttoxml/Config.in b/buildroot/package/python-dicttoxml/Config.in
similarity index 100%
rename from software/package/python-dicttoxml/Config.in
rename to buildroot/package/python-dicttoxml/Config.in
diff --git a/software/package/python-dicttoxml/python-dicttoxml.hash b/buildroot/package/python-dicttoxml/python-dicttoxml.hash
similarity index 100%
rename from software/package/python-dicttoxml/python-dicttoxml.hash
rename to buildroot/package/python-dicttoxml/python-dicttoxml.hash
diff --git a/software/package/python-dicttoxml/python-dicttoxml.mk b/buildroot/package/python-dicttoxml/python-dicttoxml.mk
similarity index 100%
rename from software/package/python-dicttoxml/python-dicttoxml.mk
rename to buildroot/package/python-dicttoxml/python-dicttoxml.mk
diff --git a/software/package/python-django-enumfields/Config.in b/buildroot/package/python-django-enumfields/Config.in
similarity index 100%
rename from software/package/python-django-enumfields/Config.in
rename to buildroot/package/python-django-enumfields/Config.in
diff --git a/software/package/python-django-enumfields/python-django-enumfields.hash b/buildroot/package/python-django-enumfields/python-django-enumfields.hash
similarity index 100%
rename from software/package/python-django-enumfields/python-django-enumfields.hash
rename to buildroot/package/python-django-enumfields/python-django-enumfields.hash
diff --git a/software/package/python-django-enumfields/python-django-enumfields.mk b/buildroot/package/python-django-enumfields/python-django-enumfields.mk
similarity index 100%
rename from software/package/python-django-enumfields/python-django-enumfields.mk
rename to buildroot/package/python-django-enumfields/python-django-enumfields.mk
diff --git a/software/package/python-django/Config.in b/buildroot/package/python-django/Config.in
similarity index 100%
rename from software/package/python-django/Config.in
rename to buildroot/package/python-django/Config.in
diff --git a/software/package/python-django/python-django.hash b/buildroot/package/python-django/python-django.hash
similarity index 100%
rename from software/package/python-django/python-django.hash
rename to buildroot/package/python-django/python-django.hash
diff --git a/software/package/python-django/python-django.mk b/buildroot/package/python-django/python-django.mk
similarity index 100%
rename from software/package/python-django/python-django.mk
rename to buildroot/package/python-django/python-django.mk
diff --git a/software/package/python-dnspython/Config.in b/buildroot/package/python-dnspython/Config.in
similarity index 100%
rename from software/package/python-dnspython/Config.in
rename to buildroot/package/python-dnspython/Config.in
diff --git a/software/package/python-dnspython/python-dnspython.hash b/buildroot/package/python-dnspython/python-dnspython.hash
similarity index 100%
rename from software/package/python-dnspython/python-dnspython.hash
rename to buildroot/package/python-dnspython/python-dnspython.hash
diff --git a/software/package/python-dnspython/python-dnspython.mk b/buildroot/package/python-dnspython/python-dnspython.mk
similarity index 100%
rename from software/package/python-dnspython/python-dnspython.mk
rename to buildroot/package/python-dnspython/python-dnspython.mk
diff --git a/software/package/python-docker-pycreds/Config.in b/buildroot/package/python-docker-pycreds/Config.in
similarity index 100%
rename from software/package/python-docker-pycreds/Config.in
rename to buildroot/package/python-docker-pycreds/Config.in
diff --git a/software/package/python-docker-pycreds/python-docker-pycreds.hash b/buildroot/package/python-docker-pycreds/python-docker-pycreds.hash
similarity index 100%
rename from software/package/python-docker-pycreds/python-docker-pycreds.hash
rename to buildroot/package/python-docker-pycreds/python-docker-pycreds.hash
diff --git a/software/package/python-docker-pycreds/python-docker-pycreds.mk b/buildroot/package/python-docker-pycreds/python-docker-pycreds.mk
similarity index 100%
rename from software/package/python-docker-pycreds/python-docker-pycreds.mk
rename to buildroot/package/python-docker-pycreds/python-docker-pycreds.mk
diff --git a/software/package/python-docker/Config.in b/buildroot/package/python-docker/Config.in
similarity index 100%
rename from software/package/python-docker/Config.in
rename to buildroot/package/python-docker/Config.in
diff --git a/software/package/python-docker/python-docker.hash b/buildroot/package/python-docker/python-docker.hash
similarity index 100%
rename from software/package/python-docker/python-docker.hash
rename to buildroot/package/python-docker/python-docker.hash
diff --git a/software/package/python-docker/python-docker.mk b/buildroot/package/python-docker/python-docker.mk
similarity index 100%
rename from software/package/python-docker/python-docker.mk
rename to buildroot/package/python-docker/python-docker.mk
diff --git a/software/package/python-dockerpty/Config.in b/buildroot/package/python-dockerpty/Config.in
similarity index 100%
rename from software/package/python-dockerpty/Config.in
rename to buildroot/package/python-dockerpty/Config.in
diff --git a/software/package/python-dockerpty/python-dockerpty.hash b/buildroot/package/python-dockerpty/python-dockerpty.hash
similarity index 100%
rename from software/package/python-dockerpty/python-dockerpty.hash
rename to buildroot/package/python-dockerpty/python-dockerpty.hash
diff --git a/software/package/python-dockerpty/python-dockerpty.mk b/buildroot/package/python-dockerpty/python-dockerpty.mk
similarity index 100%
rename from software/package/python-dockerpty/python-dockerpty.mk
rename to buildroot/package/python-dockerpty/python-dockerpty.mk
diff --git a/software/package/python-docopt/Config.in b/buildroot/package/python-docopt/Config.in
similarity index 100%
rename from software/package/python-docopt/Config.in
rename to buildroot/package/python-docopt/Config.in
diff --git a/software/package/python-docopt/python-docopt.hash b/buildroot/package/python-docopt/python-docopt.hash
similarity index 100%
rename from software/package/python-docopt/python-docopt.hash
rename to buildroot/package/python-docopt/python-docopt.hash
diff --git a/software/package/python-docopt/python-docopt.mk b/buildroot/package/python-docopt/python-docopt.mk
similarity index 100%
rename from software/package/python-docopt/python-docopt.mk
rename to buildroot/package/python-docopt/python-docopt.mk
diff --git a/software/package/python-docutils/0001-Update-setup.py.patch b/buildroot/package/python-docutils/0001-Update-setup.py.patch
similarity index 100%
rename from software/package/python-docutils/0001-Update-setup.py.patch
rename to buildroot/package/python-docutils/0001-Update-setup.py.patch
diff --git a/software/package/python-docutils/Config.in b/buildroot/package/python-docutils/Config.in
similarity index 100%
rename from software/package/python-docutils/Config.in
rename to buildroot/package/python-docutils/Config.in
diff --git a/software/package/python-docutils/python-docutils.hash b/buildroot/package/python-docutils/python-docutils.hash
similarity index 100%
rename from software/package/python-docutils/python-docutils.hash
rename to buildroot/package/python-docutils/python-docutils.hash
diff --git a/software/package/python-docutils/python-docutils.mk b/buildroot/package/python-docutils/python-docutils.mk
similarity index 100%
rename from software/package/python-docutils/python-docutils.mk
rename to buildroot/package/python-docutils/python-docutils.mk
diff --git a/software/package/python-dominate/Config.in b/buildroot/package/python-dominate/Config.in
similarity index 100%
rename from software/package/python-dominate/Config.in
rename to buildroot/package/python-dominate/Config.in
diff --git a/software/package/python-dominate/python-dominate.hash b/buildroot/package/python-dominate/python-dominate.hash
similarity index 100%
rename from software/package/python-dominate/python-dominate.hash
rename to buildroot/package/python-dominate/python-dominate.hash
diff --git a/software/package/python-dominate/python-dominate.mk b/buildroot/package/python-dominate/python-dominate.mk
similarity index 100%
rename from software/package/python-dominate/python-dominate.mk
rename to buildroot/package/python-dominate/python-dominate.mk
diff --git a/software/package/python-dpkt/Config.in b/buildroot/package/python-dpkt/Config.in
similarity index 100%
rename from software/package/python-dpkt/Config.in
rename to buildroot/package/python-dpkt/Config.in
diff --git a/software/package/python-dpkt/python-dpkt.hash b/buildroot/package/python-dpkt/python-dpkt.hash
similarity index 100%
rename from software/package/python-dpkt/python-dpkt.hash
rename to buildroot/package/python-dpkt/python-dpkt.hash
diff --git a/software/package/python-dpkt/python-dpkt.mk b/buildroot/package/python-dpkt/python-dpkt.mk
similarity index 100%
rename from software/package/python-dpkt/python-dpkt.mk
rename to buildroot/package/python-dpkt/python-dpkt.mk
diff --git a/software/package/python-ecdsa/Config.in b/buildroot/package/python-ecdsa/Config.in
similarity index 100%
rename from software/package/python-ecdsa/Config.in
rename to buildroot/package/python-ecdsa/Config.in
diff --git a/software/package/python-ecdsa/python-ecdsa.hash b/buildroot/package/python-ecdsa/python-ecdsa.hash
similarity index 100%
rename from software/package/python-ecdsa/python-ecdsa.hash
rename to buildroot/package/python-ecdsa/python-ecdsa.hash
diff --git a/software/package/python-ecdsa/python-ecdsa.mk b/buildroot/package/python-ecdsa/python-ecdsa.mk
similarity index 100%
rename from software/package/python-ecdsa/python-ecdsa.mk
rename to buildroot/package/python-ecdsa/python-ecdsa.mk
diff --git a/software/package/python-engineio/Config.in b/buildroot/package/python-engineio/Config.in
similarity index 100%
rename from software/package/python-engineio/Config.in
rename to buildroot/package/python-engineio/Config.in
diff --git a/software/package/python-engineio/python-engineio.hash b/buildroot/package/python-engineio/python-engineio.hash
similarity index 100%
rename from software/package/python-engineio/python-engineio.hash
rename to buildroot/package/python-engineio/python-engineio.hash
diff --git a/software/package/python-engineio/python-engineio.mk b/buildroot/package/python-engineio/python-engineio.mk
similarity index 100%
rename from software/package/python-engineio/python-engineio.mk
rename to buildroot/package/python-engineio/python-engineio.mk
diff --git a/software/package/python-entrypoints/Config.in b/buildroot/package/python-entrypoints/Config.in
similarity index 100%
rename from software/package/python-entrypoints/Config.in
rename to buildroot/package/python-entrypoints/Config.in
diff --git a/software/package/python-entrypoints/python-entrypoints.hash b/buildroot/package/python-entrypoints/python-entrypoints.hash
similarity index 100%
rename from software/package/python-entrypoints/python-entrypoints.hash
rename to buildroot/package/python-entrypoints/python-entrypoints.hash
diff --git a/software/package/python-entrypoints/python-entrypoints.mk b/buildroot/package/python-entrypoints/python-entrypoints.mk
similarity index 100%
rename from software/package/python-entrypoints/python-entrypoints.mk
rename to buildroot/package/python-entrypoints/python-entrypoints.mk
diff --git a/software/package/python-enum/Config.in b/buildroot/package/python-enum/Config.in
similarity index 100%
rename from software/package/python-enum/Config.in
rename to buildroot/package/python-enum/Config.in
diff --git a/software/package/python-enum/python-enum.hash b/buildroot/package/python-enum/python-enum.hash
similarity index 100%
rename from software/package/python-enum/python-enum.hash
rename to buildroot/package/python-enum/python-enum.hash
diff --git a/software/package/python-enum/python-enum.mk b/buildroot/package/python-enum/python-enum.mk
similarity index 100%
rename from software/package/python-enum/python-enum.mk
rename to buildroot/package/python-enum/python-enum.mk
diff --git a/software/package/python-enum34/Config.in b/buildroot/package/python-enum34/Config.in
similarity index 100%
rename from software/package/python-enum34/Config.in
rename to buildroot/package/python-enum34/Config.in
diff --git a/software/package/python-enum34/python-enum34.hash b/buildroot/package/python-enum34/python-enum34.hash
similarity index 100%
rename from software/package/python-enum34/python-enum34.hash
rename to buildroot/package/python-enum34/python-enum34.hash
diff --git a/software/package/python-enum34/python-enum34.mk b/buildroot/package/python-enum34/python-enum34.mk
similarity index 100%
rename from software/package/python-enum34/python-enum34.mk
rename to buildroot/package/python-enum34/python-enum34.mk
diff --git a/software/package/python-esptool/Config.in b/buildroot/package/python-esptool/Config.in
similarity index 100%
rename from software/package/python-esptool/Config.in
rename to buildroot/package/python-esptool/Config.in
diff --git a/software/package/python-esptool/python-esptool.hash b/buildroot/package/python-esptool/python-esptool.hash
similarity index 100%
rename from software/package/python-esptool/python-esptool.hash
rename to buildroot/package/python-esptool/python-esptool.hash
diff --git a/software/package/python-esptool/python-esptool.mk b/buildroot/package/python-esptool/python-esptool.mk
similarity index 100%
rename from software/package/python-esptool/python-esptool.mk
rename to buildroot/package/python-esptool/python-esptool.mk
diff --git a/software/package/python-falcon/Config.in b/buildroot/package/python-falcon/Config.in
similarity index 100%
rename from software/package/python-falcon/Config.in
rename to buildroot/package/python-falcon/Config.in
diff --git a/software/package/python-falcon/python-falcon.hash b/buildroot/package/python-falcon/python-falcon.hash
similarity index 100%
rename from software/package/python-falcon/python-falcon.hash
rename to buildroot/package/python-falcon/python-falcon.hash
diff --git a/software/package/python-falcon/python-falcon.mk b/buildroot/package/python-falcon/python-falcon.mk
similarity index 100%
rename from software/package/python-falcon/python-falcon.mk
rename to buildroot/package/python-falcon/python-falcon.mk
diff --git a/software/package/python-fastentrypoints/Config.in.host b/buildroot/package/python-fastentrypoints/Config.in.host
similarity index 100%
rename from software/package/python-fastentrypoints/Config.in.host
rename to buildroot/package/python-fastentrypoints/Config.in.host
diff --git a/software/package/python-fastentrypoints/python-fastentrypoints.hash b/buildroot/package/python-fastentrypoints/python-fastentrypoints.hash
similarity index 100%
rename from software/package/python-fastentrypoints/python-fastentrypoints.hash
rename to buildroot/package/python-fastentrypoints/python-fastentrypoints.hash
diff --git a/software/package/python-fastentrypoints/python-fastentrypoints.mk b/buildroot/package/python-fastentrypoints/python-fastentrypoints.mk
similarity index 100%
rename from software/package/python-fastentrypoints/python-fastentrypoints.mk
rename to buildroot/package/python-fastentrypoints/python-fastentrypoints.mk
diff --git a/software/package/python-fire/Config.in b/buildroot/package/python-fire/Config.in
similarity index 100%
rename from software/package/python-fire/Config.in
rename to buildroot/package/python-fire/Config.in
diff --git a/software/package/python-fire/python-fire.hash b/buildroot/package/python-fire/python-fire.hash
similarity index 100%
rename from software/package/python-fire/python-fire.hash
rename to buildroot/package/python-fire/python-fire.hash
diff --git a/software/package/python-fire/python-fire.mk b/buildroot/package/python-fire/python-fire.mk
similarity index 100%
rename from software/package/python-fire/python-fire.mk
rename to buildroot/package/python-fire/python-fire.mk
diff --git a/software/package/python-flask-babel/Config.in b/buildroot/package/python-flask-babel/Config.in
similarity index 100%
rename from software/package/python-flask-babel/Config.in
rename to buildroot/package/python-flask-babel/Config.in
diff --git a/software/package/python-flask-babel/python-flask-babel.hash b/buildroot/package/python-flask-babel/python-flask-babel.hash
similarity index 100%
rename from software/package/python-flask-babel/python-flask-babel.hash
rename to buildroot/package/python-flask-babel/python-flask-babel.hash
diff --git a/software/package/python-flask-babel/python-flask-babel.mk b/buildroot/package/python-flask-babel/python-flask-babel.mk
similarity index 100%
rename from software/package/python-flask-babel/python-flask-babel.mk
rename to buildroot/package/python-flask-babel/python-flask-babel.mk
diff --git a/software/package/python-flask-cors/Config.in b/buildroot/package/python-flask-cors/Config.in
similarity index 100%
rename from software/package/python-flask-cors/Config.in
rename to buildroot/package/python-flask-cors/Config.in
diff --git a/software/package/python-flask-cors/python-flask-cors.hash b/buildroot/package/python-flask-cors/python-flask-cors.hash
similarity index 100%
rename from software/package/python-flask-cors/python-flask-cors.hash
rename to buildroot/package/python-flask-cors/python-flask-cors.hash
diff --git a/software/package/python-flask-cors/python-flask-cors.mk b/buildroot/package/python-flask-cors/python-flask-cors.mk
similarity index 100%
rename from software/package/python-flask-cors/python-flask-cors.mk
rename to buildroot/package/python-flask-cors/python-flask-cors.mk
diff --git a/software/package/python-flask-jsonrpc/Config.in b/buildroot/package/python-flask-jsonrpc/Config.in
similarity index 100%
rename from software/package/python-flask-jsonrpc/Config.in
rename to buildroot/package/python-flask-jsonrpc/Config.in
diff --git a/software/package/python-flask-jsonrpc/python-flask-jsonrpc.hash b/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash
similarity index 100%
rename from software/package/python-flask-jsonrpc/python-flask-jsonrpc.hash
rename to buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash
diff --git a/software/package/python-flask-jsonrpc/python-flask-jsonrpc.mk b/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
similarity index 100%
rename from software/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
rename to buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
diff --git a/software/package/python-flask-login/Config.in b/buildroot/package/python-flask-login/Config.in
similarity index 100%
rename from software/package/python-flask-login/Config.in
rename to buildroot/package/python-flask-login/Config.in
diff --git a/software/package/python-flask-login/python-flask-login.hash b/buildroot/package/python-flask-login/python-flask-login.hash
similarity index 100%
rename from software/package/python-flask-login/python-flask-login.hash
rename to buildroot/package/python-flask-login/python-flask-login.hash
diff --git a/software/package/python-flask-login/python-flask-login.mk b/buildroot/package/python-flask-login/python-flask-login.mk
similarity index 100%
rename from software/package/python-flask-login/python-flask-login.mk
rename to buildroot/package/python-flask-login/python-flask-login.mk
diff --git a/software/package/python-flask-sqlalchemy/Config.in b/buildroot/package/python-flask-sqlalchemy/Config.in
similarity index 100%
rename from software/package/python-flask-sqlalchemy/Config.in
rename to buildroot/package/python-flask-sqlalchemy/Config.in
diff --git a/software/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash b/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash
similarity index 100%
rename from software/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash
rename to buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash
diff --git a/software/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk b/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk
similarity index 100%
rename from software/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk
rename to buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk
diff --git a/software/package/python-flask/Config.in b/buildroot/package/python-flask/Config.in
similarity index 100%
rename from software/package/python-flask/Config.in
rename to buildroot/package/python-flask/Config.in
diff --git a/software/package/python-flask/python-flask.hash b/buildroot/package/python-flask/python-flask.hash
similarity index 100%
rename from software/package/python-flask/python-flask.hash
rename to buildroot/package/python-flask/python-flask.hash
diff --git a/software/package/python-flask/python-flask.mk b/buildroot/package/python-flask/python-flask.mk
similarity index 100%
rename from software/package/python-flask/python-flask.mk
rename to buildroot/package/python-flask/python-flask.mk
diff --git a/software/package/python-flup/Config.in b/buildroot/package/python-flup/Config.in
similarity index 100%
rename from software/package/python-flup/Config.in
rename to buildroot/package/python-flup/Config.in
diff --git a/software/package/python-flup/python-flup.hash b/buildroot/package/python-flup/python-flup.hash
similarity index 100%
rename from software/package/python-flup/python-flup.hash
rename to buildroot/package/python-flup/python-flup.hash
diff --git a/software/package/python-flup/python-flup.mk b/buildroot/package/python-flup/python-flup.mk
similarity index 100%
rename from software/package/python-flup/python-flup.mk
rename to buildroot/package/python-flup/python-flup.mk
diff --git a/software/package/python-frozenlist/Config.in b/buildroot/package/python-frozenlist/Config.in
similarity index 100%
rename from software/package/python-frozenlist/Config.in
rename to buildroot/package/python-frozenlist/Config.in
diff --git a/software/package/python-frozenlist/python-frozenlist.hash b/buildroot/package/python-frozenlist/python-frozenlist.hash
similarity index 100%
rename from software/package/python-frozenlist/python-frozenlist.hash
rename to buildroot/package/python-frozenlist/python-frozenlist.hash
diff --git a/software/package/python-frozenlist/python-frozenlist.mk b/buildroot/package/python-frozenlist/python-frozenlist.mk
similarity index 100%
rename from software/package/python-frozenlist/python-frozenlist.mk
rename to buildroot/package/python-frozenlist/python-frozenlist.mk
diff --git a/software/package/python-functools32/Config.in b/buildroot/package/python-functools32/Config.in
similarity index 100%
rename from software/package/python-functools32/Config.in
rename to buildroot/package/python-functools32/Config.in
diff --git a/software/package/python-functools32/python-functools32.hash b/buildroot/package/python-functools32/python-functools32.hash
similarity index 100%
rename from software/package/python-functools32/python-functools32.hash
rename to buildroot/package/python-functools32/python-functools32.hash
diff --git a/software/package/python-functools32/python-functools32.mk b/buildroot/package/python-functools32/python-functools32.mk
similarity index 100%
rename from software/package/python-functools32/python-functools32.mk
rename to buildroot/package/python-functools32/python-functools32.mk
diff --git a/software/package/python-future/Config.in b/buildroot/package/python-future/Config.in
similarity index 100%
rename from software/package/python-future/Config.in
rename to buildroot/package/python-future/Config.in
diff --git a/software/package/python-future/python-future.hash b/buildroot/package/python-future/python-future.hash
similarity index 100%
rename from software/package/python-future/python-future.hash
rename to buildroot/package/python-future/python-future.hash
diff --git a/software/package/python-future/python-future.mk b/buildroot/package/python-future/python-future.mk
similarity index 100%
rename from software/package/python-future/python-future.mk
rename to buildroot/package/python-future/python-future.mk
diff --git a/software/package/python-futures/Config.in b/buildroot/package/python-futures/Config.in
similarity index 100%
rename from software/package/python-futures/Config.in
rename to buildroot/package/python-futures/Config.in
diff --git a/software/package/python-futures/python-futures.hash b/buildroot/package/python-futures/python-futures.hash
similarity index 100%
rename from software/package/python-futures/python-futures.hash
rename to buildroot/package/python-futures/python-futures.hash
diff --git a/software/package/python-futures/python-futures.mk b/buildroot/package/python-futures/python-futures.mk
similarity index 100%
rename from software/package/python-futures/python-futures.mk
rename to buildroot/package/python-futures/python-futures.mk
diff --git a/software/package/python-gitdb2/Config.in b/buildroot/package/python-gitdb2/Config.in
similarity index 100%
rename from software/package/python-gitdb2/Config.in
rename to buildroot/package/python-gitdb2/Config.in
diff --git a/software/package/python-gitdb2/python-gitdb2.hash b/buildroot/package/python-gitdb2/python-gitdb2.hash
similarity index 100%
rename from software/package/python-gitdb2/python-gitdb2.hash
rename to buildroot/package/python-gitdb2/python-gitdb2.hash
diff --git a/software/package/python-gitdb2/python-gitdb2.mk b/buildroot/package/python-gitdb2/python-gitdb2.mk
similarity index 100%
rename from software/package/python-gitdb2/python-gitdb2.mk
rename to buildroot/package/python-gitdb2/python-gitdb2.mk
diff --git a/software/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch b/buildroot/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch
similarity index 100%
rename from software/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch
rename to buildroot/package/python-gobject/0001-add-PYTHON_INCLUDES-override.patch
diff --git a/software/package/python-gobject/Config.in b/buildroot/package/python-gobject/Config.in
similarity index 100%
rename from software/package/python-gobject/Config.in
rename to buildroot/package/python-gobject/Config.in
diff --git a/software/package/python-gobject/python-gobject.hash b/buildroot/package/python-gobject/python-gobject.hash
similarity index 100%
rename from software/package/python-gobject/python-gobject.hash
rename to buildroot/package/python-gobject/python-gobject.hash
diff --git a/software/package/python-gobject/python-gobject.mk b/buildroot/package/python-gobject/python-gobject.mk
similarity index 100%
rename from software/package/python-gobject/python-gobject.mk
rename to buildroot/package/python-gobject/python-gobject.mk
diff --git a/software/package/python-gunicorn/Config.in b/buildroot/package/python-gunicorn/Config.in
similarity index 100%
rename from software/package/python-gunicorn/Config.in
rename to buildroot/package/python-gunicorn/Config.in
diff --git a/software/package/python-gunicorn/python-gunicorn.hash b/buildroot/package/python-gunicorn/python-gunicorn.hash
similarity index 100%
rename from software/package/python-gunicorn/python-gunicorn.hash
rename to buildroot/package/python-gunicorn/python-gunicorn.hash
diff --git a/software/package/python-gunicorn/python-gunicorn.mk b/buildroot/package/python-gunicorn/python-gunicorn.mk
similarity index 100%
rename from software/package/python-gunicorn/python-gunicorn.mk
rename to buildroot/package/python-gunicorn/python-gunicorn.mk
diff --git a/software/package/python-h2/Config.in b/buildroot/package/python-h2/Config.in
similarity index 100%
rename from software/package/python-h2/Config.in
rename to buildroot/package/python-h2/Config.in
diff --git a/software/package/python-h2/python-h2.hash b/buildroot/package/python-h2/python-h2.hash
similarity index 100%
rename from software/package/python-h2/python-h2.hash
rename to buildroot/package/python-h2/python-h2.hash
diff --git a/software/package/python-h2/python-h2.mk b/buildroot/package/python-h2/python-h2.mk
similarity index 100%
rename from software/package/python-h2/python-h2.mk
rename to buildroot/package/python-h2/python-h2.mk
diff --git a/software/package/python-hiredis/Config.in b/buildroot/package/python-hiredis/Config.in
similarity index 100%
rename from software/package/python-hiredis/Config.in
rename to buildroot/package/python-hiredis/Config.in
diff --git a/software/package/python-hiredis/python-hiredis.hash b/buildroot/package/python-hiredis/python-hiredis.hash
similarity index 100%
rename from software/package/python-hiredis/python-hiredis.hash
rename to buildroot/package/python-hiredis/python-hiredis.hash
diff --git a/software/package/python-hiredis/python-hiredis.mk b/buildroot/package/python-hiredis/python-hiredis.mk
similarity index 100%
rename from software/package/python-hiredis/python-hiredis.mk
rename to buildroot/package/python-hiredis/python-hiredis.mk
diff --git a/software/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch b/buildroot/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch
similarity index 100%
rename from software/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch
rename to buildroot/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch
diff --git a/software/package/python-hpack/Config.in b/buildroot/package/python-hpack/Config.in
similarity index 100%
rename from software/package/python-hpack/Config.in
rename to buildroot/package/python-hpack/Config.in
diff --git a/software/package/python-hpack/python-hpack.hash b/buildroot/package/python-hpack/python-hpack.hash
similarity index 100%
rename from software/package/python-hpack/python-hpack.hash
rename to buildroot/package/python-hpack/python-hpack.hash
diff --git a/software/package/python-hpack/python-hpack.mk b/buildroot/package/python-hpack/python-hpack.mk
similarity index 100%
rename from software/package/python-hpack/python-hpack.mk
rename to buildroot/package/python-hpack/python-hpack.mk
diff --git a/software/package/python-html5lib/Config.in b/buildroot/package/python-html5lib/Config.in
similarity index 100%
rename from software/package/python-html5lib/Config.in
rename to buildroot/package/python-html5lib/Config.in
diff --git a/software/package/python-html5lib/python-html5lib.hash b/buildroot/package/python-html5lib/python-html5lib.hash
similarity index 100%
rename from software/package/python-html5lib/python-html5lib.hash
rename to buildroot/package/python-html5lib/python-html5lib.hash
diff --git a/software/package/python-html5lib/python-html5lib.mk b/buildroot/package/python-html5lib/python-html5lib.mk
similarity index 100%
rename from software/package/python-html5lib/python-html5lib.mk
rename to buildroot/package/python-html5lib/python-html5lib.mk
diff --git a/software/package/python-httplib2/Config.in b/buildroot/package/python-httplib2/Config.in
similarity index 100%
rename from software/package/python-httplib2/Config.in
rename to buildroot/package/python-httplib2/Config.in
diff --git a/software/package/python-httplib2/python-httplib2.hash b/buildroot/package/python-httplib2/python-httplib2.hash
similarity index 100%
rename from software/package/python-httplib2/python-httplib2.hash
rename to buildroot/package/python-httplib2/python-httplib2.hash
diff --git a/software/package/python-httplib2/python-httplib2.mk b/buildroot/package/python-httplib2/python-httplib2.mk
similarity index 100%
rename from software/package/python-httplib2/python-httplib2.mk
rename to buildroot/package/python-httplib2/python-httplib2.mk
diff --git a/software/package/python-huepy/0001-fix-import-with-python3.patch b/buildroot/package/python-huepy/0001-fix-import-with-python3.patch
similarity index 100%
rename from software/package/python-huepy/0001-fix-import-with-python3.patch
rename to buildroot/package/python-huepy/0001-fix-import-with-python3.patch
diff --git a/software/package/python-huepy/Config.in b/buildroot/package/python-huepy/Config.in
similarity index 100%
rename from software/package/python-huepy/Config.in
rename to buildroot/package/python-huepy/Config.in
diff --git a/software/package/python-huepy/python-huepy.hash b/buildroot/package/python-huepy/python-huepy.hash
similarity index 100%
rename from software/package/python-huepy/python-huepy.hash
rename to buildroot/package/python-huepy/python-huepy.hash
diff --git a/software/package/python-huepy/python-huepy.mk b/buildroot/package/python-huepy/python-huepy.mk
similarity index 100%
rename from software/package/python-huepy/python-huepy.mk
rename to buildroot/package/python-huepy/python-huepy.mk
diff --git a/software/package/python-humanize/Config.in b/buildroot/package/python-humanize/Config.in
similarity index 100%
rename from software/package/python-humanize/Config.in
rename to buildroot/package/python-humanize/Config.in
diff --git a/software/package/python-humanize/python-humanize.hash b/buildroot/package/python-humanize/python-humanize.hash
similarity index 100%
rename from software/package/python-humanize/python-humanize.hash
rename to buildroot/package/python-humanize/python-humanize.hash
diff --git a/software/package/python-humanize/python-humanize.mk b/buildroot/package/python-humanize/python-humanize.mk
similarity index 100%
rename from software/package/python-humanize/python-humanize.mk
rename to buildroot/package/python-humanize/python-humanize.mk
diff --git a/software/package/python-hyperframe/Config.in b/buildroot/package/python-hyperframe/Config.in
similarity index 100%
rename from software/package/python-hyperframe/Config.in
rename to buildroot/package/python-hyperframe/Config.in
diff --git a/software/package/python-hyperframe/python-hyperframe.hash b/buildroot/package/python-hyperframe/python-hyperframe.hash
similarity index 100%
rename from software/package/python-hyperframe/python-hyperframe.hash
rename to buildroot/package/python-hyperframe/python-hyperframe.hash
diff --git a/software/package/python-hyperframe/python-hyperframe.mk b/buildroot/package/python-hyperframe/python-hyperframe.mk
similarity index 100%
rename from software/package/python-hyperframe/python-hyperframe.mk
rename to buildroot/package/python-hyperframe/python-hyperframe.mk
diff --git a/software/package/python-hyperlink/Config.in b/buildroot/package/python-hyperlink/Config.in
similarity index 100%
rename from software/package/python-hyperlink/Config.in
rename to buildroot/package/python-hyperlink/Config.in
diff --git a/software/package/python-hyperlink/python-hyperlink.hash b/buildroot/package/python-hyperlink/python-hyperlink.hash
similarity index 100%
rename from software/package/python-hyperlink/python-hyperlink.hash
rename to buildroot/package/python-hyperlink/python-hyperlink.hash
diff --git a/software/package/python-hyperlink/python-hyperlink.mk b/buildroot/package/python-hyperlink/python-hyperlink.mk
similarity index 100%
rename from software/package/python-hyperlink/python-hyperlink.mk
rename to buildroot/package/python-hyperlink/python-hyperlink.mk
diff --git a/software/package/python-ibmiotf/Config.in b/buildroot/package/python-ibmiotf/Config.in
similarity index 100%
rename from software/package/python-ibmiotf/Config.in
rename to buildroot/package/python-ibmiotf/Config.in
diff --git a/software/package/python-ibmiotf/python-ibmiotf.hash b/buildroot/package/python-ibmiotf/python-ibmiotf.hash
similarity index 100%
rename from software/package/python-ibmiotf/python-ibmiotf.hash
rename to buildroot/package/python-ibmiotf/python-ibmiotf.hash
diff --git a/software/package/python-ibmiotf/python-ibmiotf.mk b/buildroot/package/python-ibmiotf/python-ibmiotf.mk
similarity index 100%
rename from software/package/python-ibmiotf/python-ibmiotf.mk
rename to buildroot/package/python-ibmiotf/python-ibmiotf.mk
diff --git a/software/package/python-id3/Config.in b/buildroot/package/python-id3/Config.in
similarity index 100%
rename from software/package/python-id3/Config.in
rename to buildroot/package/python-id3/Config.in
diff --git a/software/package/python-id3/python-id3.hash b/buildroot/package/python-id3/python-id3.hash
similarity index 100%
rename from software/package/python-id3/python-id3.hash
rename to buildroot/package/python-id3/python-id3.hash
diff --git a/software/package/python-id3/python-id3.mk b/buildroot/package/python-id3/python-id3.mk
similarity index 100%
rename from software/package/python-id3/python-id3.mk
rename to buildroot/package/python-id3/python-id3.mk
diff --git a/software/package/python-idna/Config.in b/buildroot/package/python-idna/Config.in
similarity index 100%
rename from software/package/python-idna/Config.in
rename to buildroot/package/python-idna/Config.in
diff --git a/software/package/python-idna/python-idna.hash b/buildroot/package/python-idna/python-idna.hash
similarity index 100%
rename from software/package/python-idna/python-idna.hash
rename to buildroot/package/python-idna/python-idna.hash
diff --git a/software/package/python-idna/python-idna.mk b/buildroot/package/python-idna/python-idna.mk
similarity index 100%
rename from software/package/python-idna/python-idna.mk
rename to buildroot/package/python-idna/python-idna.mk
diff --git a/software/package/python-ifaddr/Config.in b/buildroot/package/python-ifaddr/Config.in
similarity index 100%
rename from software/package/python-ifaddr/Config.in
rename to buildroot/package/python-ifaddr/Config.in
diff --git a/software/package/python-ifaddr/python-ifaddr.hash b/buildroot/package/python-ifaddr/python-ifaddr.hash
similarity index 100%
rename from software/package/python-ifaddr/python-ifaddr.hash
rename to buildroot/package/python-ifaddr/python-ifaddr.hash
diff --git a/software/package/python-ifaddr/python-ifaddr.mk b/buildroot/package/python-ifaddr/python-ifaddr.mk
similarity index 100%
rename from software/package/python-ifaddr/python-ifaddr.mk
rename to buildroot/package/python-ifaddr/python-ifaddr.mk
diff --git a/software/package/python-incremental/Config.in b/buildroot/package/python-incremental/Config.in
similarity index 100%
rename from software/package/python-incremental/Config.in
rename to buildroot/package/python-incremental/Config.in
diff --git a/software/package/python-incremental/python-incremental.hash b/buildroot/package/python-incremental/python-incremental.hash
similarity index 100%
rename from software/package/python-incremental/python-incremental.hash
rename to buildroot/package/python-incremental/python-incremental.hash
diff --git a/software/package/python-incremental/python-incremental.mk b/buildroot/package/python-incremental/python-incremental.mk
similarity index 100%
rename from software/package/python-incremental/python-incremental.mk
rename to buildroot/package/python-incremental/python-incremental.mk
diff --git a/software/package/python-inflection/Config.in b/buildroot/package/python-inflection/Config.in
similarity index 100%
rename from software/package/python-inflection/Config.in
rename to buildroot/package/python-inflection/Config.in
diff --git a/software/package/python-inflection/python-inflection.hash b/buildroot/package/python-inflection/python-inflection.hash
similarity index 100%
rename from software/package/python-inflection/python-inflection.hash
rename to buildroot/package/python-inflection/python-inflection.hash
diff --git a/software/package/python-inflection/python-inflection.mk b/buildroot/package/python-inflection/python-inflection.mk
similarity index 100%
rename from software/package/python-inflection/python-inflection.mk
rename to buildroot/package/python-inflection/python-inflection.mk
diff --git a/software/package/python-influxdb/Config.in b/buildroot/package/python-influxdb/Config.in
similarity index 100%
rename from software/package/python-influxdb/Config.in
rename to buildroot/package/python-influxdb/Config.in
diff --git a/software/package/python-influxdb/python-influxdb.hash b/buildroot/package/python-influxdb/python-influxdb.hash
similarity index 100%
rename from software/package/python-influxdb/python-influxdb.hash
rename to buildroot/package/python-influxdb/python-influxdb.hash
diff --git a/software/package/python-influxdb/python-influxdb.mk b/buildroot/package/python-influxdb/python-influxdb.mk
similarity index 100%
rename from software/package/python-influxdb/python-influxdb.mk
rename to buildroot/package/python-influxdb/python-influxdb.mk
diff --git a/software/package/python-iniparse/Config.in b/buildroot/package/python-iniparse/Config.in
similarity index 100%
rename from software/package/python-iniparse/Config.in
rename to buildroot/package/python-iniparse/Config.in
diff --git a/software/package/python-iniparse/python-iniparse.hash b/buildroot/package/python-iniparse/python-iniparse.hash
similarity index 100%
rename from software/package/python-iniparse/python-iniparse.hash
rename to buildroot/package/python-iniparse/python-iniparse.hash
diff --git a/software/package/python-iniparse/python-iniparse.mk b/buildroot/package/python-iniparse/python-iniparse.mk
similarity index 100%
rename from software/package/python-iniparse/python-iniparse.mk
rename to buildroot/package/python-iniparse/python-iniparse.mk
diff --git a/software/package/python-iowait/Config.in b/buildroot/package/python-iowait/Config.in
similarity index 100%
rename from software/package/python-iowait/Config.in
rename to buildroot/package/python-iowait/Config.in
diff --git a/software/package/python-iowait/python-iowait.hash b/buildroot/package/python-iowait/python-iowait.hash
similarity index 100%
rename from software/package/python-iowait/python-iowait.hash
rename to buildroot/package/python-iowait/python-iowait.hash
diff --git a/software/package/python-iowait/python-iowait.mk b/buildroot/package/python-iowait/python-iowait.mk
similarity index 100%
rename from software/package/python-iowait/python-iowait.mk
rename to buildroot/package/python-iowait/python-iowait.mk
diff --git a/software/package/python-ipaddr/Config.in b/buildroot/package/python-ipaddr/Config.in
similarity index 100%
rename from software/package/python-ipaddr/Config.in
rename to buildroot/package/python-ipaddr/Config.in
diff --git a/software/package/python-ipaddr/python-ipaddr.hash b/buildroot/package/python-ipaddr/python-ipaddr.hash
similarity index 100%
rename from software/package/python-ipaddr/python-ipaddr.hash
rename to buildroot/package/python-ipaddr/python-ipaddr.hash
diff --git a/software/package/python-ipaddr/python-ipaddr.mk b/buildroot/package/python-ipaddr/python-ipaddr.mk
similarity index 100%
rename from software/package/python-ipaddr/python-ipaddr.mk
rename to buildroot/package/python-ipaddr/python-ipaddr.mk
diff --git a/software/package/python-ipaddress/Config.in b/buildroot/package/python-ipaddress/Config.in
similarity index 100%
rename from software/package/python-ipaddress/Config.in
rename to buildroot/package/python-ipaddress/Config.in
diff --git a/software/package/python-ipaddress/python-ipaddress.hash b/buildroot/package/python-ipaddress/python-ipaddress.hash
similarity index 100%
rename from software/package/python-ipaddress/python-ipaddress.hash
rename to buildroot/package/python-ipaddress/python-ipaddress.hash
diff --git a/software/package/python-ipaddress/python-ipaddress.mk b/buildroot/package/python-ipaddress/python-ipaddress.mk
similarity index 100%
rename from software/package/python-ipaddress/python-ipaddress.mk
rename to buildroot/package/python-ipaddress/python-ipaddress.mk
diff --git a/software/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch b/buildroot/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch
similarity index 100%
rename from software/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch
rename to buildroot/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch
diff --git a/software/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch b/buildroot/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch
similarity index 100%
rename from software/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch
rename to buildroot/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch
diff --git a/software/package/python-iptables/Config.in b/buildroot/package/python-iptables/Config.in
similarity index 100%
rename from software/package/python-iptables/Config.in
rename to buildroot/package/python-iptables/Config.in
diff --git a/software/package/python-iptables/python-iptables.hash b/buildroot/package/python-iptables/python-iptables.hash
similarity index 100%
rename from software/package/python-iptables/python-iptables.hash
rename to buildroot/package/python-iptables/python-iptables.hash
diff --git a/software/package/python-iptables/python-iptables.mk b/buildroot/package/python-iptables/python-iptables.mk
similarity index 100%
rename from software/package/python-iptables/python-iptables.mk
rename to buildroot/package/python-iptables/python-iptables.mk
diff --git a/software/package/python-ipy/Config.in b/buildroot/package/python-ipy/Config.in
similarity index 100%
rename from software/package/python-ipy/Config.in
rename to buildroot/package/python-ipy/Config.in
diff --git a/software/package/python-ipy/python-ipy.hash b/buildroot/package/python-ipy/python-ipy.hash
similarity index 100%
rename from software/package/python-ipy/python-ipy.hash
rename to buildroot/package/python-ipy/python-ipy.hash
diff --git a/software/package/python-ipy/python-ipy.mk b/buildroot/package/python-ipy/python-ipy.mk
similarity index 100%
rename from software/package/python-ipy/python-ipy.mk
rename to buildroot/package/python-ipy/python-ipy.mk
diff --git a/software/package/python-ipython-genutils/Config.in b/buildroot/package/python-ipython-genutils/Config.in
similarity index 100%
rename from software/package/python-ipython-genutils/Config.in
rename to buildroot/package/python-ipython-genutils/Config.in
diff --git a/software/package/python-ipython-genutils/python-ipython-genutils.hash b/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash
similarity index 100%
rename from software/package/python-ipython-genutils/python-ipython-genutils.hash
rename to buildroot/package/python-ipython-genutils/python-ipython-genutils.hash
diff --git a/software/package/python-ipython-genutils/python-ipython-genutils.mk b/buildroot/package/python-ipython-genutils/python-ipython-genutils.mk
similarity index 100%
rename from software/package/python-ipython-genutils/python-ipython-genutils.mk
rename to buildroot/package/python-ipython-genutils/python-ipython-genutils.mk
diff --git a/software/package/python-ipython/0001-set-correct-python-executable-path.patch b/buildroot/package/python-ipython/0001-set-correct-python-executable-path.patch
similarity index 100%
rename from software/package/python-ipython/0001-set-correct-python-executable-path.patch
rename to buildroot/package/python-ipython/0001-set-correct-python-executable-path.patch
diff --git a/software/package/python-ipython/Config.in b/buildroot/package/python-ipython/Config.in
similarity index 100%
rename from software/package/python-ipython/Config.in
rename to buildroot/package/python-ipython/Config.in
diff --git a/software/package/python-ipython/python-ipython.hash b/buildroot/package/python-ipython/python-ipython.hash
similarity index 100%
rename from software/package/python-ipython/python-ipython.hash
rename to buildroot/package/python-ipython/python-ipython.hash
diff --git a/software/package/python-ipython/python-ipython.mk b/buildroot/package/python-ipython/python-ipython.mk
similarity index 100%
rename from software/package/python-ipython/python-ipython.mk
rename to buildroot/package/python-ipython/python-ipython.mk
diff --git a/software/package/python-iso8601/Config.in b/buildroot/package/python-iso8601/Config.in
similarity index 100%
rename from software/package/python-iso8601/Config.in
rename to buildroot/package/python-iso8601/Config.in
diff --git a/software/package/python-iso8601/python-iso8601.hash b/buildroot/package/python-iso8601/python-iso8601.hash
similarity index 100%
rename from software/package/python-iso8601/python-iso8601.hash
rename to buildroot/package/python-iso8601/python-iso8601.hash
diff --git a/software/package/python-iso8601/python-iso8601.mk b/buildroot/package/python-iso8601/python-iso8601.mk
similarity index 100%
rename from software/package/python-iso8601/python-iso8601.mk
rename to buildroot/package/python-iso8601/python-iso8601.mk
diff --git a/software/package/python-itsdangerous/Config.in b/buildroot/package/python-itsdangerous/Config.in
similarity index 100%
rename from software/package/python-itsdangerous/Config.in
rename to buildroot/package/python-itsdangerous/Config.in
diff --git a/software/package/python-itsdangerous/python-itsdangerous.hash b/buildroot/package/python-itsdangerous/python-itsdangerous.hash
similarity index 100%
rename from software/package/python-itsdangerous/python-itsdangerous.hash
rename to buildroot/package/python-itsdangerous/python-itsdangerous.hash
diff --git a/software/package/python-itsdangerous/python-itsdangerous.mk b/buildroot/package/python-itsdangerous/python-itsdangerous.mk
similarity index 100%
rename from software/package/python-itsdangerous/python-itsdangerous.mk
rename to buildroot/package/python-itsdangerous/python-itsdangerous.mk
diff --git a/software/package/python-janus/Config.in b/buildroot/package/python-janus/Config.in
similarity index 100%
rename from software/package/python-janus/Config.in
rename to buildroot/package/python-janus/Config.in
diff --git a/software/package/python-janus/python-janus.hash b/buildroot/package/python-janus/python-janus.hash
similarity index 100%
rename from software/package/python-janus/python-janus.hash
rename to buildroot/package/python-janus/python-janus.hash
diff --git a/software/package/python-janus/python-janus.mk b/buildroot/package/python-janus/python-janus.mk
similarity index 100%
rename from software/package/python-janus/python-janus.mk
rename to buildroot/package/python-janus/python-janus.mk
diff --git a/software/package/python-jaraco-classes/Config.in b/buildroot/package/python-jaraco-classes/Config.in
similarity index 100%
rename from software/package/python-jaraco-classes/Config.in
rename to buildroot/package/python-jaraco-classes/Config.in
diff --git a/software/package/python-jaraco-classes/python-jaraco-classes.hash b/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash
similarity index 100%
rename from software/package/python-jaraco-classes/python-jaraco-classes.hash
rename to buildroot/package/python-jaraco-classes/python-jaraco-classes.hash
diff --git a/software/package/python-jaraco-classes/python-jaraco-classes.mk b/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk
similarity index 100%
rename from software/package/python-jaraco-classes/python-jaraco-classes.mk
rename to buildroot/package/python-jaraco-classes/python-jaraco-classes.mk
diff --git a/software/package/python-jaraco-functools/Config.in b/buildroot/package/python-jaraco-functools/Config.in
similarity index 100%
rename from software/package/python-jaraco-functools/Config.in
rename to buildroot/package/python-jaraco-functools/Config.in
diff --git a/software/package/python-jaraco-functools/python-jaraco-functools.hash b/buildroot/package/python-jaraco-functools/python-jaraco-functools.hash
similarity index 100%
rename from software/package/python-jaraco-functools/python-jaraco-functools.hash
rename to buildroot/package/python-jaraco-functools/python-jaraco-functools.hash
diff --git a/software/package/python-jaraco-functools/python-jaraco-functools.mk b/buildroot/package/python-jaraco-functools/python-jaraco-functools.mk
similarity index 100%
rename from software/package/python-jaraco-functools/python-jaraco-functools.mk
rename to buildroot/package/python-jaraco-functools/python-jaraco-functools.mk
diff --git a/software/package/python-jedi/Config.in b/buildroot/package/python-jedi/Config.in
similarity index 100%
rename from software/package/python-jedi/Config.in
rename to buildroot/package/python-jedi/Config.in
diff --git a/software/package/python-jedi/python-jedi.hash b/buildroot/package/python-jedi/python-jedi.hash
similarity index 100%
rename from software/package/python-jedi/python-jedi.hash
rename to buildroot/package/python-jedi/python-jedi.hash
diff --git a/software/package/python-jedi/python-jedi.mk b/buildroot/package/python-jedi/python-jedi.mk
similarity index 100%
rename from software/package/python-jedi/python-jedi.mk
rename to buildroot/package/python-jedi/python-jedi.mk
diff --git a/software/package/python-jinja2/Config.in b/buildroot/package/python-jinja2/Config.in
similarity index 100%
rename from software/package/python-jinja2/Config.in
rename to buildroot/package/python-jinja2/Config.in
diff --git a/software/package/python-jinja2/python-jinja2.hash b/buildroot/package/python-jinja2/python-jinja2.hash
similarity index 100%
rename from software/package/python-jinja2/python-jinja2.hash
rename to buildroot/package/python-jinja2/python-jinja2.hash
diff --git a/software/package/python-jinja2/python-jinja2.mk b/buildroot/package/python-jinja2/python-jinja2.mk
similarity index 100%
rename from software/package/python-jinja2/python-jinja2.mk
rename to buildroot/package/python-jinja2/python-jinja2.mk
diff --git a/software/package/python-json-schema-validator/Config.in b/buildroot/package/python-json-schema-validator/Config.in
similarity index 100%
rename from software/package/python-json-schema-validator/Config.in
rename to buildroot/package/python-json-schema-validator/Config.in
diff --git a/software/package/python-json-schema-validator/python-json-schema-validator.hash b/buildroot/package/python-json-schema-validator/python-json-schema-validator.hash
similarity index 100%
rename from software/package/python-json-schema-validator/python-json-schema-validator.hash
rename to buildroot/package/python-json-schema-validator/python-json-schema-validator.hash
diff --git a/software/package/python-json-schema-validator/python-json-schema-validator.mk b/buildroot/package/python-json-schema-validator/python-json-schema-validator.mk
similarity index 100%
rename from software/package/python-json-schema-validator/python-json-schema-validator.mk
rename to buildroot/package/python-json-schema-validator/python-json-schema-validator.mk
diff --git a/software/package/python-jsonmodels/Config.in b/buildroot/package/python-jsonmodels/Config.in
similarity index 100%
rename from software/package/python-jsonmodels/Config.in
rename to buildroot/package/python-jsonmodels/Config.in
diff --git a/software/package/python-jsonmodels/python-jsonmodels.hash b/buildroot/package/python-jsonmodels/python-jsonmodels.hash
similarity index 100%
rename from software/package/python-jsonmodels/python-jsonmodels.hash
rename to buildroot/package/python-jsonmodels/python-jsonmodels.hash
diff --git a/software/package/python-jsonmodels/python-jsonmodels.mk b/buildroot/package/python-jsonmodels/python-jsonmodels.mk
similarity index 100%
rename from software/package/python-jsonmodels/python-jsonmodels.mk
rename to buildroot/package/python-jsonmodels/python-jsonmodels.mk
diff --git a/software/package/python-jsonschema/Config.in b/buildroot/package/python-jsonschema/Config.in
similarity index 100%
rename from software/package/python-jsonschema/Config.in
rename to buildroot/package/python-jsonschema/Config.in
diff --git a/software/package/python-jsonschema/python-jsonschema.hash b/buildroot/package/python-jsonschema/python-jsonschema.hash
similarity index 100%
rename from software/package/python-jsonschema/python-jsonschema.hash
rename to buildroot/package/python-jsonschema/python-jsonschema.hash
diff --git a/software/package/python-jsonschema/python-jsonschema.mk b/buildroot/package/python-jsonschema/python-jsonschema.mk
similarity index 100%
rename from software/package/python-jsonschema/python-jsonschema.mk
rename to buildroot/package/python-jsonschema/python-jsonschema.mk
diff --git a/software/package/python-keyring/Config.in b/buildroot/package/python-keyring/Config.in
similarity index 100%
rename from software/package/python-keyring/Config.in
rename to buildroot/package/python-keyring/Config.in
diff --git a/software/package/python-keyring/python-keyring.hash b/buildroot/package/python-keyring/python-keyring.hash
similarity index 100%
rename from software/package/python-keyring/python-keyring.hash
rename to buildroot/package/python-keyring/python-keyring.hash
diff --git a/software/package/python-keyring/python-keyring.mk b/buildroot/package/python-keyring/python-keyring.mk
similarity index 100%
rename from software/package/python-keyring/python-keyring.mk
rename to buildroot/package/python-keyring/python-keyring.mk
diff --git a/software/package/python-kiwisolver/Config.in b/buildroot/package/python-kiwisolver/Config.in
similarity index 100%
rename from software/package/python-kiwisolver/Config.in
rename to buildroot/package/python-kiwisolver/Config.in
diff --git a/software/package/python-kiwisolver/python-kiwisolver.hash b/buildroot/package/python-kiwisolver/python-kiwisolver.hash
similarity index 100%
rename from software/package/python-kiwisolver/python-kiwisolver.hash
rename to buildroot/package/python-kiwisolver/python-kiwisolver.hash
diff --git a/software/package/python-kiwisolver/python-kiwisolver.mk b/buildroot/package/python-kiwisolver/python-kiwisolver.mk
similarity index 100%
rename from software/package/python-kiwisolver/python-kiwisolver.mk
rename to buildroot/package/python-kiwisolver/python-kiwisolver.mk
diff --git a/software/package/python-libconfig/Config.in b/buildroot/package/python-libconfig/Config.in
similarity index 100%
rename from software/package/python-libconfig/Config.in
rename to buildroot/package/python-libconfig/Config.in
diff --git a/software/package/python-libconfig/python-libconfig.hash b/buildroot/package/python-libconfig/python-libconfig.hash
similarity index 100%
rename from software/package/python-libconfig/python-libconfig.hash
rename to buildroot/package/python-libconfig/python-libconfig.hash
diff --git a/software/package/python-libconfig/python-libconfig.mk b/buildroot/package/python-libconfig/python-libconfig.mk
similarity index 100%
rename from software/package/python-libconfig/python-libconfig.mk
rename to buildroot/package/python-libconfig/python-libconfig.mk
diff --git a/software/package/python-libusb1/Config.in b/buildroot/package/python-libusb1/Config.in
similarity index 100%
rename from software/package/python-libusb1/Config.in
rename to buildroot/package/python-libusb1/Config.in
diff --git a/software/package/python-libusb1/python-libusb1.hash b/buildroot/package/python-libusb1/python-libusb1.hash
similarity index 100%
rename from software/package/python-libusb1/python-libusb1.hash
rename to buildroot/package/python-libusb1/python-libusb1.hash
diff --git a/software/package/python-libusb1/python-libusb1.mk b/buildroot/package/python-libusb1/python-libusb1.mk
similarity index 100%
rename from software/package/python-libusb1/python-libusb1.mk
rename to buildroot/package/python-libusb1/python-libusb1.mk
diff --git a/software/package/python-lmdb/Config.in b/buildroot/package/python-lmdb/Config.in
similarity index 100%
rename from software/package/python-lmdb/Config.in
rename to buildroot/package/python-lmdb/Config.in
diff --git a/software/package/python-lmdb/python-lmdb.hash b/buildroot/package/python-lmdb/python-lmdb.hash
similarity index 100%
rename from software/package/python-lmdb/python-lmdb.hash
rename to buildroot/package/python-lmdb/python-lmdb.hash
diff --git a/software/package/python-lmdb/python-lmdb.mk b/buildroot/package/python-lmdb/python-lmdb.mk
similarity index 100%
rename from software/package/python-lmdb/python-lmdb.mk
rename to buildroot/package/python-lmdb/python-lmdb.mk
diff --git a/software/package/python-lockfile/Config.in b/buildroot/package/python-lockfile/Config.in
similarity index 100%
rename from software/package/python-lockfile/Config.in
rename to buildroot/package/python-lockfile/Config.in
diff --git a/software/package/python-lockfile/python-lockfile.hash b/buildroot/package/python-lockfile/python-lockfile.hash
similarity index 100%
rename from software/package/python-lockfile/python-lockfile.hash
rename to buildroot/package/python-lockfile/python-lockfile.hash
diff --git a/software/package/python-lockfile/python-lockfile.mk b/buildroot/package/python-lockfile/python-lockfile.mk
similarity index 100%
rename from software/package/python-lockfile/python-lockfile.mk
rename to buildroot/package/python-lockfile/python-lockfile.mk
diff --git a/software/package/python-logbook/Config.in b/buildroot/package/python-logbook/Config.in
similarity index 100%
rename from software/package/python-logbook/Config.in
rename to buildroot/package/python-logbook/Config.in
diff --git a/software/package/python-logbook/python-logbook.hash b/buildroot/package/python-logbook/python-logbook.hash
similarity index 100%
rename from software/package/python-logbook/python-logbook.hash
rename to buildroot/package/python-logbook/python-logbook.hash
diff --git a/software/package/python-logbook/python-logbook.mk b/buildroot/package/python-logbook/python-logbook.mk
similarity index 100%
rename from software/package/python-logbook/python-logbook.mk
rename to buildroot/package/python-logbook/python-logbook.mk
diff --git a/software/package/python-logstash/Config.in b/buildroot/package/python-logstash/Config.in
similarity index 100%
rename from software/package/python-logstash/Config.in
rename to buildroot/package/python-logstash/Config.in
diff --git a/software/package/python-logstash/python-logstash.hash b/buildroot/package/python-logstash/python-logstash.hash
similarity index 100%
rename from software/package/python-logstash/python-logstash.hash
rename to buildroot/package/python-logstash/python-logstash.hash
diff --git a/software/package/python-logstash/python-logstash.mk b/buildroot/package/python-logstash/python-logstash.mk
similarity index 100%
rename from software/package/python-logstash/python-logstash.mk
rename to buildroot/package/python-logstash/python-logstash.mk
diff --git a/software/package/python-lxml/Config.in b/buildroot/package/python-lxml/Config.in
similarity index 100%
rename from software/package/python-lxml/Config.in
rename to buildroot/package/python-lxml/Config.in
diff --git a/software/package/python-lxml/Config.in.host b/buildroot/package/python-lxml/Config.in.host
similarity index 100%
rename from software/package/python-lxml/Config.in.host
rename to buildroot/package/python-lxml/Config.in.host
diff --git a/software/package/python-lxml/python-lxml.hash b/buildroot/package/python-lxml/python-lxml.hash
similarity index 100%
rename from software/package/python-lxml/python-lxml.hash
rename to buildroot/package/python-lxml/python-lxml.hash
diff --git a/software/package/python-lxml/python-lxml.mk b/buildroot/package/python-lxml/python-lxml.mk
similarity index 100%
rename from software/package/python-lxml/python-lxml.mk
rename to buildroot/package/python-lxml/python-lxml.mk
diff --git a/software/package/python-m2r/Config.in b/buildroot/package/python-m2r/Config.in
similarity index 100%
rename from software/package/python-m2r/Config.in
rename to buildroot/package/python-m2r/Config.in
diff --git a/software/package/python-m2r/python-m2r.hash b/buildroot/package/python-m2r/python-m2r.hash
similarity index 100%
rename from software/package/python-m2r/python-m2r.hash
rename to buildroot/package/python-m2r/python-m2r.hash
diff --git a/software/package/python-m2r/python-m2r.mk b/buildroot/package/python-m2r/python-m2r.mk
similarity index 100%
rename from software/package/python-m2r/python-m2r.mk
rename to buildroot/package/python-m2r/python-m2r.mk
diff --git a/software/package/python-mad/Config.in b/buildroot/package/python-mad/Config.in
similarity index 100%
rename from software/package/python-mad/Config.in
rename to buildroot/package/python-mad/Config.in
diff --git a/software/package/python-mad/python-mad.hash b/buildroot/package/python-mad/python-mad.hash
similarity index 100%
rename from software/package/python-mad/python-mad.hash
rename to buildroot/package/python-mad/python-mad.hash
diff --git a/software/package/python-mad/python-mad.mk b/buildroot/package/python-mad/python-mad.mk
similarity index 100%
rename from software/package/python-mad/python-mad.mk
rename to buildroot/package/python-mad/python-mad.mk
diff --git a/software/package/python-mako/Config.in b/buildroot/package/python-mako/Config.in
similarity index 100%
rename from software/package/python-mako/Config.in
rename to buildroot/package/python-mako/Config.in
diff --git a/software/package/python-mako/python-mako.hash b/buildroot/package/python-mako/python-mako.hash
similarity index 100%
rename from software/package/python-mako/python-mako.hash
rename to buildroot/package/python-mako/python-mako.hash
diff --git a/software/package/python-mako/python-mako.mk b/buildroot/package/python-mako/python-mako.mk
similarity index 100%
rename from software/package/python-mako/python-mako.mk
rename to buildroot/package/python-mako/python-mako.mk
diff --git a/software/package/python-markdown/Config.in b/buildroot/package/python-markdown/Config.in
similarity index 100%
rename from software/package/python-markdown/Config.in
rename to buildroot/package/python-markdown/Config.in
diff --git a/software/package/python-markdown/python-markdown.hash b/buildroot/package/python-markdown/python-markdown.hash
similarity index 100%
rename from software/package/python-markdown/python-markdown.hash
rename to buildroot/package/python-markdown/python-markdown.hash
diff --git a/software/package/python-markdown/python-markdown.mk b/buildroot/package/python-markdown/python-markdown.mk
similarity index 100%
rename from software/package/python-markdown/python-markdown.mk
rename to buildroot/package/python-markdown/python-markdown.mk
diff --git a/software/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch b/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch
similarity index 100%
rename from software/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch
rename to buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch
diff --git a/software/package/python-markdown2/0002-Better-fix-for-issue-348.patch b/buildroot/package/python-markdown2/0002-Better-fix-for-issue-348.patch
similarity index 100%
rename from software/package/python-markdown2/0002-Better-fix-for-issue-348.patch
rename to buildroot/package/python-markdown2/0002-Better-fix-for-issue-348.patch
diff --git a/software/package/python-markdown2/Config.in b/buildroot/package/python-markdown2/Config.in
similarity index 100%
rename from software/package/python-markdown2/Config.in
rename to buildroot/package/python-markdown2/Config.in
diff --git a/software/package/python-markdown2/python-markdown2.hash b/buildroot/package/python-markdown2/python-markdown2.hash
similarity index 100%
rename from software/package/python-markdown2/python-markdown2.hash
rename to buildroot/package/python-markdown2/python-markdown2.hash
diff --git a/software/package/python-markdown2/python-markdown2.mk b/buildroot/package/python-markdown2/python-markdown2.mk
similarity index 100%
rename from software/package/python-markdown2/python-markdown2.mk
rename to buildroot/package/python-markdown2/python-markdown2.mk
diff --git a/software/package/python-markupsafe/Config.in b/buildroot/package/python-markupsafe/Config.in
similarity index 100%
rename from software/package/python-markupsafe/Config.in
rename to buildroot/package/python-markupsafe/Config.in
diff --git a/software/package/python-markupsafe/python-markupsafe.hash b/buildroot/package/python-markupsafe/python-markupsafe.hash
similarity index 100%
rename from software/package/python-markupsafe/python-markupsafe.hash
rename to buildroot/package/python-markupsafe/python-markupsafe.hash
diff --git a/software/package/python-markupsafe/python-markupsafe.mk b/buildroot/package/python-markupsafe/python-markupsafe.mk
similarity index 100%
rename from software/package/python-markupsafe/python-markupsafe.mk
rename to buildroot/package/python-markupsafe/python-markupsafe.mk
diff --git a/software/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch b/buildroot/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch
similarity index 100%
rename from software/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch
rename to buildroot/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch
diff --git a/software/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch b/buildroot/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch
similarity index 100%
rename from software/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch
rename to buildroot/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch
diff --git a/software/package/python-matplotlib/Config.in b/buildroot/package/python-matplotlib/Config.in
similarity index 100%
rename from software/package/python-matplotlib/Config.in
rename to buildroot/package/python-matplotlib/Config.in
diff --git a/software/package/python-matplotlib/python-matplotlib.hash b/buildroot/package/python-matplotlib/python-matplotlib.hash
similarity index 100%
rename from software/package/python-matplotlib/python-matplotlib.hash
rename to buildroot/package/python-matplotlib/python-matplotlib.hash
diff --git a/software/package/python-matplotlib/python-matplotlib.mk b/buildroot/package/python-matplotlib/python-matplotlib.mk
similarity index 100%
rename from software/package/python-matplotlib/python-matplotlib.mk
rename to buildroot/package/python-matplotlib/python-matplotlib.mk
diff --git a/software/package/python-mbstrdecoder/Config.in b/buildroot/package/python-mbstrdecoder/Config.in
similarity index 100%
rename from software/package/python-mbstrdecoder/Config.in
rename to buildroot/package/python-mbstrdecoder/Config.in
diff --git a/software/package/python-mbstrdecoder/python-mbstrdecoder.hash b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash
similarity index 100%
rename from software/package/python-mbstrdecoder/python-mbstrdecoder.hash
rename to buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash
diff --git a/software/package/python-mbstrdecoder/python-mbstrdecoder.mk b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk
similarity index 100%
rename from software/package/python-mbstrdecoder/python-mbstrdecoder.mk
rename to buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk
diff --git a/software/package/python-meld3/Config.in b/buildroot/package/python-meld3/Config.in
similarity index 100%
rename from software/package/python-meld3/Config.in
rename to buildroot/package/python-meld3/Config.in
diff --git a/software/package/python-meld3/python-meld3.hash b/buildroot/package/python-meld3/python-meld3.hash
similarity index 100%
rename from software/package/python-meld3/python-meld3.hash
rename to buildroot/package/python-meld3/python-meld3.hash
diff --git a/software/package/python-meld3/python-meld3.mk b/buildroot/package/python-meld3/python-meld3.mk
similarity index 100%
rename from software/package/python-meld3/python-meld3.mk
rename to buildroot/package/python-meld3/python-meld3.mk
diff --git a/software/package/python-mimeparse/Config.in b/buildroot/package/python-mimeparse/Config.in
similarity index 100%
rename from software/package/python-mimeparse/Config.in
rename to buildroot/package/python-mimeparse/Config.in
diff --git a/software/package/python-mimeparse/python-mimeparse.hash b/buildroot/package/python-mimeparse/python-mimeparse.hash
similarity index 100%
rename from software/package/python-mimeparse/python-mimeparse.hash
rename to buildroot/package/python-mimeparse/python-mimeparse.hash
diff --git a/software/package/python-mimeparse/python-mimeparse.mk b/buildroot/package/python-mimeparse/python-mimeparse.mk
similarity index 100%
rename from software/package/python-mimeparse/python-mimeparse.mk
rename to buildroot/package/python-mimeparse/python-mimeparse.mk
diff --git a/software/package/python-mistune/Config.in b/buildroot/package/python-mistune/Config.in
similarity index 100%
rename from software/package/python-mistune/Config.in
rename to buildroot/package/python-mistune/Config.in
diff --git a/software/package/python-mistune/python-mistune.hash b/buildroot/package/python-mistune/python-mistune.hash
similarity index 100%
rename from software/package/python-mistune/python-mistune.hash
rename to buildroot/package/python-mistune/python-mistune.hash
diff --git a/software/package/python-mistune/python-mistune.mk b/buildroot/package/python-mistune/python-mistune.mk
similarity index 100%
rename from software/package/python-mistune/python-mistune.mk
rename to buildroot/package/python-mistune/python-mistune.mk
diff --git a/software/package/python-more-itertools/Config.in b/buildroot/package/python-more-itertools/Config.in
similarity index 100%
rename from software/package/python-more-itertools/Config.in
rename to buildroot/package/python-more-itertools/Config.in
diff --git a/software/package/python-more-itertools/python-more-itertools.hash b/buildroot/package/python-more-itertools/python-more-itertools.hash
similarity index 100%
rename from software/package/python-more-itertools/python-more-itertools.hash
rename to buildroot/package/python-more-itertools/python-more-itertools.hash
diff --git a/software/package/python-more-itertools/python-more-itertools.mk b/buildroot/package/python-more-itertools/python-more-itertools.mk
similarity index 100%
rename from software/package/python-more-itertools/python-more-itertools.mk
rename to buildroot/package/python-more-itertools/python-more-itertools.mk
diff --git a/software/package/python-msgfy/Config.in b/buildroot/package/python-msgfy/Config.in
similarity index 100%
rename from software/package/python-msgfy/Config.in
rename to buildroot/package/python-msgfy/Config.in
diff --git a/software/package/python-msgfy/python-msgfy.hash b/buildroot/package/python-msgfy/python-msgfy.hash
similarity index 100%
rename from software/package/python-msgfy/python-msgfy.hash
rename to buildroot/package/python-msgfy/python-msgfy.hash
diff --git a/software/package/python-msgfy/python-msgfy.mk b/buildroot/package/python-msgfy/python-msgfy.mk
similarity index 100%
rename from software/package/python-msgfy/python-msgfy.mk
rename to buildroot/package/python-msgfy/python-msgfy.mk
diff --git a/software/package/python-msgpack/Config.in b/buildroot/package/python-msgpack/Config.in
similarity index 100%
rename from software/package/python-msgpack/Config.in
rename to buildroot/package/python-msgpack/Config.in
diff --git a/software/package/python-msgpack/python-msgpack.hash b/buildroot/package/python-msgpack/python-msgpack.hash
similarity index 100%
rename from software/package/python-msgpack/python-msgpack.hash
rename to buildroot/package/python-msgpack/python-msgpack.hash
diff --git a/software/package/python-msgpack/python-msgpack.mk b/buildroot/package/python-msgpack/python-msgpack.mk
similarity index 100%
rename from software/package/python-msgpack/python-msgpack.mk
rename to buildroot/package/python-msgpack/python-msgpack.mk
diff --git a/software/package/python-multidict/Config.in b/buildroot/package/python-multidict/Config.in
similarity index 100%
rename from software/package/python-multidict/Config.in
rename to buildroot/package/python-multidict/Config.in
diff --git a/software/package/python-multidict/python-multidict.hash b/buildroot/package/python-multidict/python-multidict.hash
similarity index 100%
rename from software/package/python-multidict/python-multidict.hash
rename to buildroot/package/python-multidict/python-multidict.hash
diff --git a/software/package/python-multidict/python-multidict.mk b/buildroot/package/python-multidict/python-multidict.mk
similarity index 100%
rename from software/package/python-multidict/python-multidict.mk
rename to buildroot/package/python-multidict/python-multidict.mk
diff --git a/software/package/python-mutagen/Config.in b/buildroot/package/python-mutagen/Config.in
similarity index 100%
rename from software/package/python-mutagen/Config.in
rename to buildroot/package/python-mutagen/Config.in
diff --git a/software/package/python-mutagen/python-mutagen.hash b/buildroot/package/python-mutagen/python-mutagen.hash
similarity index 100%
rename from software/package/python-mutagen/python-mutagen.hash
rename to buildroot/package/python-mutagen/python-mutagen.hash
diff --git a/software/package/python-mutagen/python-mutagen.mk b/buildroot/package/python-mutagen/python-mutagen.mk
similarity index 100%
rename from software/package/python-mutagen/python-mutagen.mk
rename to buildroot/package/python-mutagen/python-mutagen.mk
diff --git a/software/package/python-mwclient/Config.in b/buildroot/package/python-mwclient/Config.in
similarity index 100%
rename from software/package/python-mwclient/Config.in
rename to buildroot/package/python-mwclient/Config.in
diff --git a/software/package/python-mwclient/python-mwclient.hash b/buildroot/package/python-mwclient/python-mwclient.hash
similarity index 100%
rename from software/package/python-mwclient/python-mwclient.hash
rename to buildroot/package/python-mwclient/python-mwclient.hash
diff --git a/software/package/python-mwclient/python-mwclient.mk b/buildroot/package/python-mwclient/python-mwclient.mk
similarity index 100%
rename from software/package/python-mwclient/python-mwclient.mk
rename to buildroot/package/python-mwclient/python-mwclient.mk
diff --git a/software/package/python-mwscrape/Config.in b/buildroot/package/python-mwscrape/Config.in
similarity index 100%
rename from software/package/python-mwscrape/Config.in
rename to buildroot/package/python-mwscrape/Config.in
diff --git a/software/package/python-mwscrape/python-mwscrape.hash b/buildroot/package/python-mwscrape/python-mwscrape.hash
similarity index 100%
rename from software/package/python-mwscrape/python-mwscrape.hash
rename to buildroot/package/python-mwscrape/python-mwscrape.hash
diff --git a/software/package/python-mwscrape/python-mwscrape.mk b/buildroot/package/python-mwscrape/python-mwscrape.mk
similarity index 100%
rename from software/package/python-mwscrape/python-mwscrape.mk
rename to buildroot/package/python-mwscrape/python-mwscrape.mk
diff --git a/software/package/python-mwscrape2slob/Config.in b/buildroot/package/python-mwscrape2slob/Config.in
similarity index 100%
rename from software/package/python-mwscrape2slob/Config.in
rename to buildroot/package/python-mwscrape2slob/Config.in
diff --git a/software/package/python-mwscrape2slob/python-mwscrape2slob.hash b/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.hash
similarity index 100%
rename from software/package/python-mwscrape2slob/python-mwscrape2slob.hash
rename to buildroot/package/python-mwscrape2slob/python-mwscrape2slob.hash
diff --git a/software/package/python-mwscrape2slob/python-mwscrape2slob.mk b/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk
similarity index 100%
rename from software/package/python-mwscrape2slob/python-mwscrape2slob.mk
rename to buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk
diff --git a/software/package/python-nested-dict/Config.in b/buildroot/package/python-nested-dict/Config.in
similarity index 100%
rename from software/package/python-nested-dict/Config.in
rename to buildroot/package/python-nested-dict/Config.in
diff --git a/software/package/python-nested-dict/python-nested-dict.hash b/buildroot/package/python-nested-dict/python-nested-dict.hash
similarity index 100%
rename from software/package/python-nested-dict/python-nested-dict.hash
rename to buildroot/package/python-nested-dict/python-nested-dict.hash
diff --git a/software/package/python-nested-dict/python-nested-dict.mk b/buildroot/package/python-nested-dict/python-nested-dict.mk
similarity index 100%
rename from software/package/python-nested-dict/python-nested-dict.mk
rename to buildroot/package/python-nested-dict/python-nested-dict.mk
diff --git a/software/package/python-netaddr/Config.in b/buildroot/package/python-netaddr/Config.in
similarity index 100%
rename from software/package/python-netaddr/Config.in
rename to buildroot/package/python-netaddr/Config.in
diff --git a/software/package/python-netaddr/python-netaddr.hash b/buildroot/package/python-netaddr/python-netaddr.hash
similarity index 100%
rename from software/package/python-netaddr/python-netaddr.hash
rename to buildroot/package/python-netaddr/python-netaddr.hash
diff --git a/software/package/python-netaddr/python-netaddr.mk b/buildroot/package/python-netaddr/python-netaddr.mk
similarity index 100%
rename from software/package/python-netaddr/python-netaddr.mk
rename to buildroot/package/python-netaddr/python-netaddr.mk
diff --git a/software/package/python-netifaces/Config.in b/buildroot/package/python-netifaces/Config.in
similarity index 100%
rename from software/package/python-netifaces/Config.in
rename to buildroot/package/python-netifaces/Config.in
diff --git a/software/package/python-netifaces/python-netifaces.hash b/buildroot/package/python-netifaces/python-netifaces.hash
similarity index 100%
rename from software/package/python-netifaces/python-netifaces.hash
rename to buildroot/package/python-netifaces/python-netifaces.hash
diff --git a/software/package/python-netifaces/python-netifaces.mk b/buildroot/package/python-netifaces/python-netifaces.mk
similarity index 100%
rename from software/package/python-netifaces/python-netifaces.mk
rename to buildroot/package/python-netifaces/python-netifaces.mk
diff --git a/software/package/python-networkmanager/Config.in b/buildroot/package/python-networkmanager/Config.in
similarity index 100%
rename from software/package/python-networkmanager/Config.in
rename to buildroot/package/python-networkmanager/Config.in
diff --git a/software/package/python-networkmanager/python-networkmanager.hash b/buildroot/package/python-networkmanager/python-networkmanager.hash
similarity index 100%
rename from software/package/python-networkmanager/python-networkmanager.hash
rename to buildroot/package/python-networkmanager/python-networkmanager.hash
diff --git a/software/package/python-networkmanager/python-networkmanager.mk b/buildroot/package/python-networkmanager/python-networkmanager.mk
similarity index 100%
rename from software/package/python-networkmanager/python-networkmanager.mk
rename to buildroot/package/python-networkmanager/python-networkmanager.mk
diff --git a/software/package/python-networkx/Config.in b/buildroot/package/python-networkx/Config.in
similarity index 100%
rename from software/package/python-networkx/Config.in
rename to buildroot/package/python-networkx/Config.in
diff --git a/software/package/python-networkx/python-networkx.hash b/buildroot/package/python-networkx/python-networkx.hash
similarity index 100%
rename from software/package/python-networkx/python-networkx.hash
rename to buildroot/package/python-networkx/python-networkx.hash
diff --git a/software/package/python-networkx/python-networkx.mk b/buildroot/package/python-networkx/python-networkx.mk
similarity index 100%
rename from software/package/python-networkx/python-networkx.mk
rename to buildroot/package/python-networkx/python-networkx.mk
diff --git a/software/package/python-nfc/Config.in b/buildroot/package/python-nfc/Config.in
similarity index 100%
rename from software/package/python-nfc/Config.in
rename to buildroot/package/python-nfc/Config.in
diff --git a/software/package/python-nfc/python-nfc.hash b/buildroot/package/python-nfc/python-nfc.hash
similarity index 100%
rename from software/package/python-nfc/python-nfc.hash
rename to buildroot/package/python-nfc/python-nfc.hash
diff --git a/software/package/python-nfc/python-nfc.mk b/buildroot/package/python-nfc/python-nfc.mk
similarity index 100%
rename from software/package/python-nfc/python-nfc.mk
rename to buildroot/package/python-nfc/python-nfc.mk
diff --git a/software/package/python-numpy/Config.in b/buildroot/package/python-numpy/Config.in
similarity index 100%
rename from software/package/python-numpy/Config.in
rename to buildroot/package/python-numpy/Config.in
diff --git a/software/package/python-numpy/python-numpy.hash b/buildroot/package/python-numpy/python-numpy.hash
similarity index 100%
rename from software/package/python-numpy/python-numpy.hash
rename to buildroot/package/python-numpy/python-numpy.hash
diff --git a/software/package/python-numpy/python-numpy.mk b/buildroot/package/python-numpy/python-numpy.mk
similarity index 100%
rename from software/package/python-numpy/python-numpy.mk
rename to buildroot/package/python-numpy/python-numpy.mk
diff --git a/software/package/python-oauthlib/Config.in b/buildroot/package/python-oauthlib/Config.in
similarity index 100%
rename from software/package/python-oauthlib/Config.in
rename to buildroot/package/python-oauthlib/Config.in
diff --git a/software/package/python-oauthlib/python-oauthlib.hash b/buildroot/package/python-oauthlib/python-oauthlib.hash
similarity index 100%
rename from software/package/python-oauthlib/python-oauthlib.hash
rename to buildroot/package/python-oauthlib/python-oauthlib.hash
diff --git a/software/package/python-oauthlib/python-oauthlib.mk b/buildroot/package/python-oauthlib/python-oauthlib.mk
similarity index 100%
rename from software/package/python-oauthlib/python-oauthlib.mk
rename to buildroot/package/python-oauthlib/python-oauthlib.mk
diff --git a/software/package/python-paho-mqtt/Config.in b/buildroot/package/python-paho-mqtt/Config.in
similarity index 100%
rename from software/package/python-paho-mqtt/Config.in
rename to buildroot/package/python-paho-mqtt/Config.in
diff --git a/software/package/python-paho-mqtt/python-paho-mqtt.hash b/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash
similarity index 100%
rename from software/package/python-paho-mqtt/python-paho-mqtt.hash
rename to buildroot/package/python-paho-mqtt/python-paho-mqtt.hash
diff --git a/software/package/python-paho-mqtt/python-paho-mqtt.mk b/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk
similarity index 100%
rename from software/package/python-paho-mqtt/python-paho-mqtt.mk
rename to buildroot/package/python-paho-mqtt/python-paho-mqtt.mk
diff --git a/software/package/python-pam/0001-dealloc.patch b/buildroot/package/python-pam/0001-dealloc.patch
similarity index 100%
rename from software/package/python-pam/0001-dealloc.patch
rename to buildroot/package/python-pam/0001-dealloc.patch
diff --git a/software/package/python-pam/0002-nofree.patch b/buildroot/package/python-pam/0002-nofree.patch
similarity index 100%
rename from software/package/python-pam/0002-nofree.patch
rename to buildroot/package/python-pam/0002-nofree.patch
diff --git a/software/package/python-pam/0003-memory-errors-CVE2012-1502.patch b/buildroot/package/python-pam/0003-memory-errors-CVE2012-1502.patch
similarity index 100%
rename from software/package/python-pam/0003-memory-errors-CVE2012-1502.patch
rename to buildroot/package/python-pam/0003-memory-errors-CVE2012-1502.patch
diff --git a/software/package/python-pam/Config.in b/buildroot/package/python-pam/Config.in
similarity index 100%
rename from software/package/python-pam/Config.in
rename to buildroot/package/python-pam/Config.in
diff --git a/software/package/python-pam/python-pam.hash b/buildroot/package/python-pam/python-pam.hash
similarity index 100%
rename from software/package/python-pam/python-pam.hash
rename to buildroot/package/python-pam/python-pam.hash
diff --git a/software/package/python-pam/python-pam.mk b/buildroot/package/python-pam/python-pam.mk
similarity index 100%
rename from software/package/python-pam/python-pam.mk
rename to buildroot/package/python-pam/python-pam.mk
diff --git a/software/package/python-paramiko/Config.in b/buildroot/package/python-paramiko/Config.in
similarity index 100%
rename from software/package/python-paramiko/Config.in
rename to buildroot/package/python-paramiko/Config.in
diff --git a/software/package/python-paramiko/python-paramiko.hash b/buildroot/package/python-paramiko/python-paramiko.hash
similarity index 100%
rename from software/package/python-paramiko/python-paramiko.hash
rename to buildroot/package/python-paramiko/python-paramiko.hash
diff --git a/software/package/python-paramiko/python-paramiko.mk b/buildroot/package/python-paramiko/python-paramiko.mk
similarity index 100%
rename from software/package/python-paramiko/python-paramiko.mk
rename to buildroot/package/python-paramiko/python-paramiko.mk
diff --git a/software/package/python-parso/Config.in b/buildroot/package/python-parso/Config.in
similarity index 100%
rename from software/package/python-parso/Config.in
rename to buildroot/package/python-parso/Config.in
diff --git a/software/package/python-parso/python-parso.hash b/buildroot/package/python-parso/python-parso.hash
similarity index 100%
rename from software/package/python-parso/python-parso.hash
rename to buildroot/package/python-parso/python-parso.hash
diff --git a/software/package/python-parso/python-parso.mk b/buildroot/package/python-parso/python-parso.mk
similarity index 100%
rename from software/package/python-parso/python-parso.mk
rename to buildroot/package/python-parso/python-parso.mk
diff --git a/software/package/python-passlib/Config.in b/buildroot/package/python-passlib/Config.in
similarity index 100%
rename from software/package/python-passlib/Config.in
rename to buildroot/package/python-passlib/Config.in
diff --git a/software/package/python-passlib/python-passlib.hash b/buildroot/package/python-passlib/python-passlib.hash
similarity index 100%
rename from software/package/python-passlib/python-passlib.hash
rename to buildroot/package/python-passlib/python-passlib.hash
diff --git a/software/package/python-passlib/python-passlib.mk b/buildroot/package/python-passlib/python-passlib.mk
similarity index 100%
rename from software/package/python-passlib/python-passlib.mk
rename to buildroot/package/python-passlib/python-passlib.mk
diff --git a/software/package/python-pathlib2/Config.in b/buildroot/package/python-pathlib2/Config.in
similarity index 100%
rename from software/package/python-pathlib2/Config.in
rename to buildroot/package/python-pathlib2/Config.in
diff --git a/software/package/python-pathlib2/python-pathlib2.hash b/buildroot/package/python-pathlib2/python-pathlib2.hash
similarity index 100%
rename from software/package/python-pathlib2/python-pathlib2.hash
rename to buildroot/package/python-pathlib2/python-pathlib2.hash
diff --git a/software/package/python-pathlib2/python-pathlib2.mk b/buildroot/package/python-pathlib2/python-pathlib2.mk
similarity index 100%
rename from software/package/python-pathlib2/python-pathlib2.mk
rename to buildroot/package/python-pathlib2/python-pathlib2.mk
diff --git a/software/package/python-pathpy/Config.in b/buildroot/package/python-pathpy/Config.in
similarity index 100%
rename from software/package/python-pathpy/Config.in
rename to buildroot/package/python-pathpy/Config.in
diff --git a/software/package/python-pathpy/python-pathpy.hash b/buildroot/package/python-pathpy/python-pathpy.hash
similarity index 100%
rename from software/package/python-pathpy/python-pathpy.hash
rename to buildroot/package/python-pathpy/python-pathpy.hash
diff --git a/software/package/python-pathpy/python-pathpy.mk b/buildroot/package/python-pathpy/python-pathpy.mk
similarity index 100%
rename from software/package/python-pathpy/python-pathpy.mk
rename to buildroot/package/python-pathpy/python-pathpy.mk
diff --git a/software/package/python-pathtools/Config.in b/buildroot/package/python-pathtools/Config.in
similarity index 100%
rename from software/package/python-pathtools/Config.in
rename to buildroot/package/python-pathtools/Config.in
diff --git a/software/package/python-pathtools/python-pathtools.hash b/buildroot/package/python-pathtools/python-pathtools.hash
similarity index 100%
rename from software/package/python-pathtools/python-pathtools.hash
rename to buildroot/package/python-pathtools/python-pathtools.hash
diff --git a/software/package/python-pathtools/python-pathtools.mk b/buildroot/package/python-pathtools/python-pathtools.mk
similarity index 100%
rename from software/package/python-pathtools/python-pathtools.mk
rename to buildroot/package/python-pathtools/python-pathtools.mk
diff --git a/software/package/python-pathvalidate/Config.in b/buildroot/package/python-pathvalidate/Config.in
similarity index 100%
rename from software/package/python-pathvalidate/Config.in
rename to buildroot/package/python-pathvalidate/Config.in
diff --git a/software/package/python-pathvalidate/python-pathvalidate.hash b/buildroot/package/python-pathvalidate/python-pathvalidate.hash
similarity index 100%
rename from software/package/python-pathvalidate/python-pathvalidate.hash
rename to buildroot/package/python-pathvalidate/python-pathvalidate.hash
diff --git a/software/package/python-pathvalidate/python-pathvalidate.mk b/buildroot/package/python-pathvalidate/python-pathvalidate.mk
similarity index 100%
rename from software/package/python-pathvalidate/python-pathvalidate.mk
rename to buildroot/package/python-pathvalidate/python-pathvalidate.mk
diff --git a/software/package/python-pbr/python-pbr.hash b/buildroot/package/python-pbr/python-pbr.hash
similarity index 100%
rename from software/package/python-pbr/python-pbr.hash
rename to buildroot/package/python-pbr/python-pbr.hash
diff --git a/software/package/python-pbr/python-pbr.mk b/buildroot/package/python-pbr/python-pbr.mk
similarity index 100%
rename from software/package/python-pbr/python-pbr.mk
rename to buildroot/package/python-pbr/python-pbr.mk
diff --git a/software/package/python-periphery/Config.in b/buildroot/package/python-periphery/Config.in
similarity index 100%
rename from software/package/python-periphery/Config.in
rename to buildroot/package/python-periphery/Config.in
diff --git a/software/package/python-periphery/python-periphery.hash b/buildroot/package/python-periphery/python-periphery.hash
similarity index 100%
rename from software/package/python-periphery/python-periphery.hash
rename to buildroot/package/python-periphery/python-periphery.hash
diff --git a/software/package/python-periphery/python-periphery.mk b/buildroot/package/python-periphery/python-periphery.mk
similarity index 100%
rename from software/package/python-periphery/python-periphery.mk
rename to buildroot/package/python-periphery/python-periphery.mk
diff --git a/software/package/python-pexpect/Config.in b/buildroot/package/python-pexpect/Config.in
similarity index 100%
rename from software/package/python-pexpect/Config.in
rename to buildroot/package/python-pexpect/Config.in
diff --git a/software/package/python-pexpect/python-pexpect.hash b/buildroot/package/python-pexpect/python-pexpect.hash
similarity index 100%
rename from software/package/python-pexpect/python-pexpect.hash
rename to buildroot/package/python-pexpect/python-pexpect.hash
diff --git a/software/package/python-pexpect/python-pexpect.mk b/buildroot/package/python-pexpect/python-pexpect.mk
similarity index 100%
rename from software/package/python-pexpect/python-pexpect.mk
rename to buildroot/package/python-pexpect/python-pexpect.mk
diff --git a/software/package/python-pickleshare/Config.in b/buildroot/package/python-pickleshare/Config.in
similarity index 100%
rename from software/package/python-pickleshare/Config.in
rename to buildroot/package/python-pickleshare/Config.in
diff --git a/software/package/python-pickleshare/python-pickleshare.hash b/buildroot/package/python-pickleshare/python-pickleshare.hash
similarity index 100%
rename from software/package/python-pickleshare/python-pickleshare.hash
rename to buildroot/package/python-pickleshare/python-pickleshare.hash
diff --git a/software/package/python-pickleshare/python-pickleshare.mk b/buildroot/package/python-pickleshare/python-pickleshare.mk
similarity index 100%
rename from software/package/python-pickleshare/python-pickleshare.mk
rename to buildroot/package/python-pickleshare/python-pickleshare.mk
diff --git a/software/package/python-pigpio/Config.in b/buildroot/package/python-pigpio/Config.in
similarity index 100%
rename from software/package/python-pigpio/Config.in
rename to buildroot/package/python-pigpio/Config.in
diff --git a/software/package/python-pigpio/python-pigpio.hash b/buildroot/package/python-pigpio/python-pigpio.hash
similarity index 100%
rename from software/package/python-pigpio/python-pigpio.hash
rename to buildroot/package/python-pigpio/python-pigpio.hash
diff --git a/software/package/python-pigpio/python-pigpio.mk b/buildroot/package/python-pigpio/python-pigpio.mk
similarity index 100%
rename from software/package/python-pigpio/python-pigpio.mk
rename to buildroot/package/python-pigpio/python-pigpio.mk
diff --git a/software/package/python-pillow/Config.in b/buildroot/package/python-pillow/Config.in
similarity index 100%
rename from software/package/python-pillow/Config.in
rename to buildroot/package/python-pillow/Config.in
diff --git a/software/package/python-pillow/python-pillow.hash b/buildroot/package/python-pillow/python-pillow.hash
similarity index 100%
rename from software/package/python-pillow/python-pillow.hash
rename to buildroot/package/python-pillow/python-pillow.hash
diff --git a/software/package/python-pillow/python-pillow.mk b/buildroot/package/python-pillow/python-pillow.mk
similarity index 100%
rename from software/package/python-pillow/python-pillow.mk
rename to buildroot/package/python-pillow/python-pillow.mk
diff --git a/software/package/python-pip/Config.in b/buildroot/package/python-pip/Config.in
similarity index 100%
rename from software/package/python-pip/Config.in
rename to buildroot/package/python-pip/Config.in
diff --git a/software/package/python-pip/python-pip.hash b/buildroot/package/python-pip/python-pip.hash
similarity index 100%
rename from software/package/python-pip/python-pip.hash
rename to buildroot/package/python-pip/python-pip.hash
diff --git a/software/package/python-pip/python-pip.mk b/buildroot/package/python-pip/python-pip.mk
similarity index 100%
rename from software/package/python-pip/python-pip.mk
rename to buildroot/package/python-pip/python-pip.mk
diff --git a/software/package/python-ply/Config.in b/buildroot/package/python-ply/Config.in
similarity index 100%
rename from software/package/python-ply/Config.in
rename to buildroot/package/python-ply/Config.in
diff --git a/software/package/python-ply/python-ply.hash b/buildroot/package/python-ply/python-ply.hash
similarity index 100%
rename from software/package/python-ply/python-ply.hash
rename to buildroot/package/python-ply/python-ply.hash
diff --git a/software/package/python-ply/python-ply.mk b/buildroot/package/python-ply/python-ply.mk
similarity index 100%
rename from software/package/python-ply/python-ply.mk
rename to buildroot/package/python-ply/python-ply.mk
diff --git a/software/package/python-portend/Config.in b/buildroot/package/python-portend/Config.in
similarity index 100%
rename from software/package/python-portend/Config.in
rename to buildroot/package/python-portend/Config.in
diff --git a/software/package/python-portend/python-portend.hash b/buildroot/package/python-portend/python-portend.hash
similarity index 100%
rename from software/package/python-portend/python-portend.hash
rename to buildroot/package/python-portend/python-portend.hash
diff --git a/software/package/python-portend/python-portend.mk b/buildroot/package/python-portend/python-portend.mk
similarity index 100%
rename from software/package/python-portend/python-portend.mk
rename to buildroot/package/python-portend/python-portend.mk
diff --git a/software/package/python-posix-ipc/Config.in b/buildroot/package/python-posix-ipc/Config.in
similarity index 100%
rename from software/package/python-posix-ipc/Config.in
rename to buildroot/package/python-posix-ipc/Config.in
diff --git a/software/package/python-posix-ipc/python-posix-ipc.hash b/buildroot/package/python-posix-ipc/python-posix-ipc.hash
similarity index 100%
rename from software/package/python-posix-ipc/python-posix-ipc.hash
rename to buildroot/package/python-posix-ipc/python-posix-ipc.hash
diff --git a/software/package/python-posix-ipc/python-posix-ipc.mk b/buildroot/package/python-posix-ipc/python-posix-ipc.mk
similarity index 100%
rename from software/package/python-posix-ipc/python-posix-ipc.mk
rename to buildroot/package/python-posix-ipc/python-posix-ipc.mk
diff --git a/software/package/python-priority/Config.in b/buildroot/package/python-priority/Config.in
similarity index 100%
rename from software/package/python-priority/Config.in
rename to buildroot/package/python-priority/Config.in
diff --git a/software/package/python-priority/python-priority.hash b/buildroot/package/python-priority/python-priority.hash
similarity index 100%
rename from software/package/python-priority/python-priority.hash
rename to buildroot/package/python-priority/python-priority.hash
diff --git a/software/package/python-priority/python-priority.mk b/buildroot/package/python-priority/python-priority.mk
similarity index 100%
rename from software/package/python-priority/python-priority.mk
rename to buildroot/package/python-priority/python-priority.mk
diff --git a/software/package/python-prompt-toolkit/Config.in b/buildroot/package/python-prompt-toolkit/Config.in
similarity index 100%
rename from software/package/python-prompt-toolkit/Config.in
rename to buildroot/package/python-prompt-toolkit/Config.in
diff --git a/software/package/python-prompt-toolkit/python-prompt-toolkit.hash b/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash
similarity index 100%
rename from software/package/python-prompt-toolkit/python-prompt-toolkit.hash
rename to buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash
diff --git a/software/package/python-prompt-toolkit/python-prompt-toolkit.mk b/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk
similarity index 100%
rename from software/package/python-prompt-toolkit/python-prompt-toolkit.mk
rename to buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk
diff --git a/software/package/python-protobuf/Config.in b/buildroot/package/python-protobuf/Config.in
similarity index 100%
rename from software/package/python-protobuf/Config.in
rename to buildroot/package/python-protobuf/Config.in
diff --git a/software/package/python-protobuf/python-protobuf.hash b/buildroot/package/python-protobuf/python-protobuf.hash
similarity index 100%
rename from software/package/python-protobuf/python-protobuf.hash
rename to buildroot/package/python-protobuf/python-protobuf.hash
diff --git a/software/package/python-protobuf/python-protobuf.mk b/buildroot/package/python-protobuf/python-protobuf.mk
similarity index 100%
rename from software/package/python-protobuf/python-protobuf.mk
rename to buildroot/package/python-protobuf/python-protobuf.mk
diff --git a/software/package/python-psutil/Config.in b/buildroot/package/python-psutil/Config.in
similarity index 100%
rename from software/package/python-psutil/Config.in
rename to buildroot/package/python-psutil/Config.in
diff --git a/software/package/python-psutil/python-psutil.hash b/buildroot/package/python-psutil/python-psutil.hash
similarity index 100%
rename from software/package/python-psutil/python-psutil.hash
rename to buildroot/package/python-psutil/python-psutil.hash
diff --git a/software/package/python-psutil/python-psutil.mk b/buildroot/package/python-psutil/python-psutil.mk
similarity index 100%
rename from software/package/python-psutil/python-psutil.mk
rename to buildroot/package/python-psutil/python-psutil.mk
diff --git a/software/package/python-psycopg2/Config.in b/buildroot/package/python-psycopg2/Config.in
similarity index 100%
rename from software/package/python-psycopg2/Config.in
rename to buildroot/package/python-psycopg2/Config.in
diff --git a/software/package/python-psycopg2/python-psycopg2.hash b/buildroot/package/python-psycopg2/python-psycopg2.hash
similarity index 100%
rename from software/package/python-psycopg2/python-psycopg2.hash
rename to buildroot/package/python-psycopg2/python-psycopg2.hash
diff --git a/software/package/python-psycopg2/python-psycopg2.mk b/buildroot/package/python-psycopg2/python-psycopg2.mk
similarity index 100%
rename from software/package/python-psycopg2/python-psycopg2.mk
rename to buildroot/package/python-psycopg2/python-psycopg2.mk
diff --git a/software/package/python-ptyprocess/Config.in b/buildroot/package/python-ptyprocess/Config.in
similarity index 100%
rename from software/package/python-ptyprocess/Config.in
rename to buildroot/package/python-ptyprocess/Config.in
diff --git a/software/package/python-ptyprocess/python-ptyprocess.hash b/buildroot/package/python-ptyprocess/python-ptyprocess.hash
similarity index 100%
rename from software/package/python-ptyprocess/python-ptyprocess.hash
rename to buildroot/package/python-ptyprocess/python-ptyprocess.hash
diff --git a/software/package/python-ptyprocess/python-ptyprocess.mk b/buildroot/package/python-ptyprocess/python-ptyprocess.mk
similarity index 100%
rename from software/package/python-ptyprocess/python-ptyprocess.mk
rename to buildroot/package/python-ptyprocess/python-ptyprocess.mk
diff --git a/software/package/python-pudb/Config.in b/buildroot/package/python-pudb/Config.in
similarity index 100%
rename from software/package/python-pudb/Config.in
rename to buildroot/package/python-pudb/Config.in
diff --git a/software/package/python-pudb/python-pudb.hash b/buildroot/package/python-pudb/python-pudb.hash
similarity index 100%
rename from software/package/python-pudb/python-pudb.hash
rename to buildroot/package/python-pudb/python-pudb.hash
diff --git a/software/package/python-pudb/python-pudb.mk b/buildroot/package/python-pudb/python-pudb.mk
similarity index 100%
rename from software/package/python-pudb/python-pudb.mk
rename to buildroot/package/python-pudb/python-pudb.mk
diff --git a/software/package/python-py/Config.in b/buildroot/package/python-py/Config.in
similarity index 100%
rename from software/package/python-py/Config.in
rename to buildroot/package/python-py/Config.in
diff --git a/software/package/python-py/python-py.hash b/buildroot/package/python-py/python-py.hash
similarity index 100%
rename from software/package/python-py/python-py.hash
rename to buildroot/package/python-py/python-py.hash
diff --git a/software/package/python-py/python-py.mk b/buildroot/package/python-py/python-py.mk
similarity index 100%
rename from software/package/python-py/python-py.mk
rename to buildroot/package/python-py/python-py.mk
diff --git a/software/package/python-pyaes/Config.in b/buildroot/package/python-pyaes/Config.in
similarity index 100%
rename from software/package/python-pyaes/Config.in
rename to buildroot/package/python-pyaes/Config.in
diff --git a/software/package/python-pyaes/python-pyaes.hash b/buildroot/package/python-pyaes/python-pyaes.hash
similarity index 100%
rename from software/package/python-pyaes/python-pyaes.hash
rename to buildroot/package/python-pyaes/python-pyaes.hash
diff --git a/software/package/python-pyaes/python-pyaes.mk b/buildroot/package/python-pyaes/python-pyaes.mk
similarity index 100%
rename from software/package/python-pyaes/python-pyaes.mk
rename to buildroot/package/python-pyaes/python-pyaes.mk
diff --git a/software/package/python-pyasn-modules/Config.in b/buildroot/package/python-pyasn-modules/Config.in
similarity index 100%
rename from software/package/python-pyasn-modules/Config.in
rename to buildroot/package/python-pyasn-modules/Config.in
diff --git a/software/package/python-pyasn-modules/python-pyasn-modules.hash b/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash
similarity index 100%
rename from software/package/python-pyasn-modules/python-pyasn-modules.hash
rename to buildroot/package/python-pyasn-modules/python-pyasn-modules.hash
diff --git a/software/package/python-pyasn-modules/python-pyasn-modules.mk b/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk
similarity index 100%
rename from software/package/python-pyasn-modules/python-pyasn-modules.mk
rename to buildroot/package/python-pyasn-modules/python-pyasn-modules.mk
diff --git a/software/package/python-pyasn/Config.in b/buildroot/package/python-pyasn/Config.in
similarity index 100%
rename from software/package/python-pyasn/Config.in
rename to buildroot/package/python-pyasn/Config.in
diff --git a/software/package/python-pyasn/python-pyasn.hash b/buildroot/package/python-pyasn/python-pyasn.hash
similarity index 100%
rename from software/package/python-pyasn/python-pyasn.hash
rename to buildroot/package/python-pyasn/python-pyasn.hash
diff --git a/software/package/python-pyasn/python-pyasn.mk b/buildroot/package/python-pyasn/python-pyasn.mk
similarity index 100%
rename from software/package/python-pyasn/python-pyasn.mk
rename to buildroot/package/python-pyasn/python-pyasn.mk
diff --git a/software/package/python-pyasn1-modules/Config.in b/buildroot/package/python-pyasn1-modules/Config.in
similarity index 100%
rename from software/package/python-pyasn1-modules/Config.in
rename to buildroot/package/python-pyasn1-modules/Config.in
diff --git a/software/package/python-pyasn1-modules/python-pyasn1-modules.hash b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash
similarity index 100%
rename from software/package/python-pyasn1-modules/python-pyasn1-modules.hash
rename to buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash
diff --git a/software/package/python-pyasn1-modules/python-pyasn1-modules.mk b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk
similarity index 100%
rename from software/package/python-pyasn1-modules/python-pyasn1-modules.mk
rename to buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk
diff --git a/software/package/python-pyasn1/Config.in b/buildroot/package/python-pyasn1/Config.in
similarity index 100%
rename from software/package/python-pyasn1/Config.in
rename to buildroot/package/python-pyasn1/Config.in
diff --git a/software/package/python-pyasn1/python-pyasn1.hash b/buildroot/package/python-pyasn1/python-pyasn1.hash
similarity index 100%
rename from software/package/python-pyasn1/python-pyasn1.hash
rename to buildroot/package/python-pyasn1/python-pyasn1.hash
diff --git a/software/package/python-pyasn1/python-pyasn1.mk b/buildroot/package/python-pyasn1/python-pyasn1.mk
similarity index 100%
rename from software/package/python-pyasn1/python-pyasn1.mk
rename to buildroot/package/python-pyasn1/python-pyasn1.mk
diff --git a/software/package/python-pycairo/Config.in b/buildroot/package/python-pycairo/Config.in
similarity index 100%
rename from software/package/python-pycairo/Config.in
rename to buildroot/package/python-pycairo/Config.in
diff --git a/software/package/python-pycairo/python-pycairo.hash b/buildroot/package/python-pycairo/python-pycairo.hash
similarity index 100%
rename from software/package/python-pycairo/python-pycairo.hash
rename to buildroot/package/python-pycairo/python-pycairo.hash
diff --git a/software/package/python-pycairo/python-pycairo.mk b/buildroot/package/python-pycairo/python-pycairo.mk
similarity index 100%
rename from software/package/python-pycairo/python-pycairo.mk
rename to buildroot/package/python-pycairo/python-pycairo.mk
diff --git a/software/package/python-pycares/Config.in b/buildroot/package/python-pycares/Config.in
similarity index 100%
rename from software/package/python-pycares/Config.in
rename to buildroot/package/python-pycares/Config.in
diff --git a/software/package/python-pycares/python-pycares.hash b/buildroot/package/python-pycares/python-pycares.hash
similarity index 100%
rename from software/package/python-pycares/python-pycares.hash
rename to buildroot/package/python-pycares/python-pycares.hash
diff --git a/software/package/python-pycares/python-pycares.mk b/buildroot/package/python-pycares/python-pycares.mk
similarity index 100%
rename from software/package/python-pycares/python-pycares.mk
rename to buildroot/package/python-pycares/python-pycares.mk
diff --git a/software/package/python-pycli/Config.in b/buildroot/package/python-pycli/Config.in
similarity index 100%
rename from software/package/python-pycli/Config.in
rename to buildroot/package/python-pycli/Config.in
diff --git a/software/package/python-pycli/python-pycli.hash b/buildroot/package/python-pycli/python-pycli.hash
similarity index 100%
rename from software/package/python-pycli/python-pycli.hash
rename to buildroot/package/python-pycli/python-pycli.hash
diff --git a/software/package/python-pycli/python-pycli.mk b/buildroot/package/python-pycli/python-pycli.mk
similarity index 100%
rename from software/package/python-pycli/python-pycli.mk
rename to buildroot/package/python-pycli/python-pycli.mk
diff --git a/software/package/python-pycparser/Config.in b/buildroot/package/python-pycparser/Config.in
similarity index 100%
rename from software/package/python-pycparser/Config.in
rename to buildroot/package/python-pycparser/Config.in
diff --git a/software/package/python-pycparser/python-pycparser.hash b/buildroot/package/python-pycparser/python-pycparser.hash
similarity index 100%
rename from software/package/python-pycparser/python-pycparser.hash
rename to buildroot/package/python-pycparser/python-pycparser.hash
diff --git a/software/package/python-pycparser/python-pycparser.mk b/buildroot/package/python-pycparser/python-pycparser.mk
similarity index 100%
rename from software/package/python-pycparser/python-pycparser.mk
rename to buildroot/package/python-pycparser/python-pycparser.mk
diff --git a/software/package/python-pycryptodomex/Config.in b/buildroot/package/python-pycryptodomex/Config.in
similarity index 100%
rename from software/package/python-pycryptodomex/Config.in
rename to buildroot/package/python-pycryptodomex/Config.in
diff --git a/software/package/python-pycryptodomex/python-pycryptodomex.hash b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash
similarity index 100%
rename from software/package/python-pycryptodomex/python-pycryptodomex.hash
rename to buildroot/package/python-pycryptodomex/python-pycryptodomex.hash
diff --git a/software/package/python-pycryptodomex/python-pycryptodomex.mk b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk
similarity index 100%
rename from software/package/python-pycryptodomex/python-pycryptodomex.mk
rename to buildroot/package/python-pycryptodomex/python-pycryptodomex.mk
diff --git a/software/package/python-pydal/Config.in b/buildroot/package/python-pydal/Config.in
similarity index 100%
rename from software/package/python-pydal/Config.in
rename to buildroot/package/python-pydal/Config.in
diff --git a/software/package/python-pydal/python-pydal.hash b/buildroot/package/python-pydal/python-pydal.hash
similarity index 100%
rename from software/package/python-pydal/python-pydal.hash
rename to buildroot/package/python-pydal/python-pydal.hash
diff --git a/software/package/python-pydal/python-pydal.mk b/buildroot/package/python-pydal/python-pydal.mk
similarity index 100%
rename from software/package/python-pydal/python-pydal.mk
rename to buildroot/package/python-pydal/python-pydal.mk
diff --git a/software/package/python-pydantic/Config.in b/buildroot/package/python-pydantic/Config.in
similarity index 100%
rename from software/package/python-pydantic/Config.in
rename to buildroot/package/python-pydantic/Config.in
diff --git a/software/package/python-pydantic/python-pydantic.hash b/buildroot/package/python-pydantic/python-pydantic.hash
similarity index 100%
rename from software/package/python-pydantic/python-pydantic.hash
rename to buildroot/package/python-pydantic/python-pydantic.hash
diff --git a/software/package/python-pydantic/python-pydantic.mk b/buildroot/package/python-pydantic/python-pydantic.mk
similarity index 100%
rename from software/package/python-pydantic/python-pydantic.mk
rename to buildroot/package/python-pydantic/python-pydantic.mk
diff --git a/software/package/python-pyelftools/Config.in b/buildroot/package/python-pyelftools/Config.in
similarity index 100%
rename from software/package/python-pyelftools/Config.in
rename to buildroot/package/python-pyelftools/Config.in
diff --git a/software/package/python-pyelftools/python-pyelftools.hash b/buildroot/package/python-pyelftools/python-pyelftools.hash
similarity index 100%
rename from software/package/python-pyelftools/python-pyelftools.hash
rename to buildroot/package/python-pyelftools/python-pyelftools.hash
diff --git a/software/package/python-pyelftools/python-pyelftools.mk b/buildroot/package/python-pyelftools/python-pyelftools.mk
similarity index 100%
rename from software/package/python-pyelftools/python-pyelftools.mk
rename to buildroot/package/python-pyelftools/python-pyelftools.mk
diff --git a/software/package/python-pyftpdlib/Config.in b/buildroot/package/python-pyftpdlib/Config.in
similarity index 100%
rename from software/package/python-pyftpdlib/Config.in
rename to buildroot/package/python-pyftpdlib/Config.in
diff --git a/software/package/python-pyftpdlib/python-pyftpdlib.hash b/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash
similarity index 100%
rename from software/package/python-pyftpdlib/python-pyftpdlib.hash
rename to buildroot/package/python-pyftpdlib/python-pyftpdlib.hash
diff --git a/software/package/python-pyftpdlib/python-pyftpdlib.mk b/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk
similarity index 100%
rename from software/package/python-pyftpdlib/python-pyftpdlib.mk
rename to buildroot/package/python-pyftpdlib/python-pyftpdlib.mk
diff --git a/software/package/python-pygame/Config.in b/buildroot/package/python-pygame/Config.in
similarity index 100%
rename from software/package/python-pygame/Config.in
rename to buildroot/package/python-pygame/Config.in
diff --git a/software/package/python-pygame/python-pygame.hash b/buildroot/package/python-pygame/python-pygame.hash
similarity index 100%
rename from software/package/python-pygame/python-pygame.hash
rename to buildroot/package/python-pygame/python-pygame.hash
diff --git a/software/package/python-pygame/python-pygame.mk b/buildroot/package/python-pygame/python-pygame.mk
similarity index 100%
rename from software/package/python-pygame/python-pygame.mk
rename to buildroot/package/python-pygame/python-pygame.mk
diff --git a/software/package/python-pygments/Config.in b/buildroot/package/python-pygments/Config.in
similarity index 100%
rename from software/package/python-pygments/Config.in
rename to buildroot/package/python-pygments/Config.in
diff --git a/software/package/python-pygments/python-pygments.hash b/buildroot/package/python-pygments/python-pygments.hash
similarity index 100%
rename from software/package/python-pygments/python-pygments.hash
rename to buildroot/package/python-pygments/python-pygments.hash
diff --git a/software/package/python-pygments/python-pygments.mk b/buildroot/package/python-pygments/python-pygments.mk
similarity index 100%
rename from software/package/python-pygments/python-pygments.mk
rename to buildroot/package/python-pygments/python-pygments.mk
diff --git a/software/package/python-pyhamcrest/Config.in b/buildroot/package/python-pyhamcrest/Config.in
similarity index 100%
rename from software/package/python-pyhamcrest/Config.in
rename to buildroot/package/python-pyhamcrest/Config.in
diff --git a/software/package/python-pyhamcrest/python-pyhamcrest.hash b/buildroot/package/python-pyhamcrest/python-pyhamcrest.hash
similarity index 100%
rename from software/package/python-pyhamcrest/python-pyhamcrest.hash
rename to buildroot/package/python-pyhamcrest/python-pyhamcrest.hash
diff --git a/software/package/python-pyhamcrest/python-pyhamcrest.mk b/buildroot/package/python-pyhamcrest/python-pyhamcrest.mk
similarity index 100%
rename from software/package/python-pyhamcrest/python-pyhamcrest.mk
rename to buildroot/package/python-pyhamcrest/python-pyhamcrest.mk
diff --git a/software/package/python-pyicu/Config.in b/buildroot/package/python-pyicu/Config.in
similarity index 100%
rename from software/package/python-pyicu/Config.in
rename to buildroot/package/python-pyicu/Config.in
diff --git a/software/package/python-pyicu/python-pyicu.hash b/buildroot/package/python-pyicu/python-pyicu.hash
similarity index 100%
rename from software/package/python-pyicu/python-pyicu.hash
rename to buildroot/package/python-pyicu/python-pyicu.hash
diff --git a/software/package/python-pyicu/python-pyicu.mk b/buildroot/package/python-pyicu/python-pyicu.mk
similarity index 100%
rename from software/package/python-pyicu/python-pyicu.mk
rename to buildroot/package/python-pyicu/python-pyicu.mk
diff --git a/software/package/python-pyinotify/Config.in b/buildroot/package/python-pyinotify/Config.in
similarity index 100%
rename from software/package/python-pyinotify/Config.in
rename to buildroot/package/python-pyinotify/Config.in
diff --git a/software/package/python-pyinotify/python-pyinotify.hash b/buildroot/package/python-pyinotify/python-pyinotify.hash
similarity index 100%
rename from software/package/python-pyinotify/python-pyinotify.hash
rename to buildroot/package/python-pyinotify/python-pyinotify.hash
diff --git a/software/package/python-pyinotify/python-pyinotify.mk b/buildroot/package/python-pyinotify/python-pyinotify.mk
similarity index 100%
rename from software/package/python-pyinotify/python-pyinotify.mk
rename to buildroot/package/python-pyinotify/python-pyinotify.mk
diff --git a/software/package/python-pyjwt/Config.in b/buildroot/package/python-pyjwt/Config.in
similarity index 100%
rename from software/package/python-pyjwt/Config.in
rename to buildroot/package/python-pyjwt/Config.in
diff --git a/software/package/python-pyjwt/python-pyjwt.hash b/buildroot/package/python-pyjwt/python-pyjwt.hash
similarity index 100%
rename from software/package/python-pyjwt/python-pyjwt.hash
rename to buildroot/package/python-pyjwt/python-pyjwt.hash
diff --git a/software/package/python-pyjwt/python-pyjwt.mk b/buildroot/package/python-pyjwt/python-pyjwt.mk
similarity index 100%
rename from software/package/python-pyjwt/python-pyjwt.mk
rename to buildroot/package/python-pyjwt/python-pyjwt.mk
diff --git a/software/package/python-pylibftdi/0001-do-not-use-find-library.patch b/buildroot/package/python-pylibftdi/0001-do-not-use-find-library.patch
similarity index 100%
rename from software/package/python-pylibftdi/0001-do-not-use-find-library.patch
rename to buildroot/package/python-pylibftdi/0001-do-not-use-find-library.patch
diff --git a/software/package/python-pylibftdi/Config.in b/buildroot/package/python-pylibftdi/Config.in
similarity index 100%
rename from software/package/python-pylibftdi/Config.in
rename to buildroot/package/python-pylibftdi/Config.in
diff --git a/software/package/python-pylibftdi/python-pylibftdi.hash b/buildroot/package/python-pylibftdi/python-pylibftdi.hash
similarity index 100%
rename from software/package/python-pylibftdi/python-pylibftdi.hash
rename to buildroot/package/python-pylibftdi/python-pylibftdi.hash
diff --git a/software/package/python-pylibftdi/python-pylibftdi.mk b/buildroot/package/python-pylibftdi/python-pylibftdi.mk
similarity index 100%
rename from software/package/python-pylibftdi/python-pylibftdi.mk
rename to buildroot/package/python-pylibftdi/python-pylibftdi.mk
diff --git a/software/package/python-pylru/Config.in b/buildroot/package/python-pylru/Config.in
similarity index 100%
rename from software/package/python-pylru/Config.in
rename to buildroot/package/python-pylru/Config.in
diff --git a/software/package/python-pylru/python-pylru.hash b/buildroot/package/python-pylru/python-pylru.hash
similarity index 100%
rename from software/package/python-pylru/python-pylru.hash
rename to buildroot/package/python-pylru/python-pylru.hash
diff --git a/software/package/python-pylru/python-pylru.mk b/buildroot/package/python-pylru/python-pylru.mk
similarity index 100%
rename from software/package/python-pylru/python-pylru.mk
rename to buildroot/package/python-pylru/python-pylru.mk
diff --git a/software/package/python-pymodbus/Config.in b/buildroot/package/python-pymodbus/Config.in
similarity index 100%
rename from software/package/python-pymodbus/Config.in
rename to buildroot/package/python-pymodbus/Config.in
diff --git a/software/package/python-pymodbus/python-pymodbus.hash b/buildroot/package/python-pymodbus/python-pymodbus.hash
similarity index 100%
rename from software/package/python-pymodbus/python-pymodbus.hash
rename to buildroot/package/python-pymodbus/python-pymodbus.hash
diff --git a/software/package/python-pymodbus/python-pymodbus.mk b/buildroot/package/python-pymodbus/python-pymodbus.mk
similarity index 100%
rename from software/package/python-pymodbus/python-pymodbus.mk
rename to buildroot/package/python-pymodbus/python-pymodbus.mk
diff --git a/software/package/python-pymysql/Config.in b/buildroot/package/python-pymysql/Config.in
similarity index 100%
rename from software/package/python-pymysql/Config.in
rename to buildroot/package/python-pymysql/Config.in
diff --git a/software/package/python-pymysql/python-pymysql.hash b/buildroot/package/python-pymysql/python-pymysql.hash
similarity index 100%
rename from software/package/python-pymysql/python-pymysql.hash
rename to buildroot/package/python-pymysql/python-pymysql.hash
diff --git a/software/package/python-pymysql/python-pymysql.mk b/buildroot/package/python-pymysql/python-pymysql.mk
similarity index 100%
rename from software/package/python-pymysql/python-pymysql.mk
rename to buildroot/package/python-pymysql/python-pymysql.mk
diff --git a/software/package/python-pynacl/Config.in b/buildroot/package/python-pynacl/Config.in
similarity index 100%
rename from software/package/python-pynacl/Config.in
rename to buildroot/package/python-pynacl/Config.in
diff --git a/software/package/python-pynacl/python-pynacl.hash b/buildroot/package/python-pynacl/python-pynacl.hash
similarity index 100%
rename from software/package/python-pynacl/python-pynacl.hash
rename to buildroot/package/python-pynacl/python-pynacl.hash
diff --git a/software/package/python-pynacl/python-pynacl.mk b/buildroot/package/python-pynacl/python-pynacl.mk
similarity index 100%
rename from software/package/python-pynacl/python-pynacl.mk
rename to buildroot/package/python-pynacl/python-pynacl.mk
diff --git a/software/package/python-pyopenssl/Config.in b/buildroot/package/python-pyopenssl/Config.in
similarity index 100%
rename from software/package/python-pyopenssl/Config.in
rename to buildroot/package/python-pyopenssl/Config.in
diff --git a/software/package/python-pyopenssl/python-pyopenssl.hash b/buildroot/package/python-pyopenssl/python-pyopenssl.hash
similarity index 100%
rename from software/package/python-pyopenssl/python-pyopenssl.hash
rename to buildroot/package/python-pyopenssl/python-pyopenssl.hash
diff --git a/software/package/python-pyopenssl/python-pyopenssl.mk b/buildroot/package/python-pyopenssl/python-pyopenssl.mk
similarity index 100%
rename from software/package/python-pyopenssl/python-pyopenssl.mk
rename to buildroot/package/python-pyopenssl/python-pyopenssl.mk
diff --git a/software/package/python-pyparsing/Config.in b/buildroot/package/python-pyparsing/Config.in
similarity index 100%
rename from software/package/python-pyparsing/Config.in
rename to buildroot/package/python-pyparsing/Config.in
diff --git a/software/package/python-pyparsing/python-pyparsing.hash b/buildroot/package/python-pyparsing/python-pyparsing.hash
similarity index 100%
rename from software/package/python-pyparsing/python-pyparsing.hash
rename to buildroot/package/python-pyparsing/python-pyparsing.hash
diff --git a/software/package/python-pyparsing/python-pyparsing.mk b/buildroot/package/python-pyparsing/python-pyparsing.mk
similarity index 100%
rename from software/package/python-pyparsing/python-pyparsing.mk
rename to buildroot/package/python-pyparsing/python-pyparsing.mk
diff --git a/software/package/python-pyparted/Config.in b/buildroot/package/python-pyparted/Config.in
similarity index 100%
rename from software/package/python-pyparted/Config.in
rename to buildroot/package/python-pyparted/Config.in
diff --git a/software/package/python-pyparted/python-pyparted.hash b/buildroot/package/python-pyparted/python-pyparted.hash
similarity index 100%
rename from software/package/python-pyparted/python-pyparted.hash
rename to buildroot/package/python-pyparted/python-pyparted.hash
diff --git a/software/package/python-pyparted/python-pyparted.mk b/buildroot/package/python-pyparted/python-pyparted.mk
similarity index 100%
rename from software/package/python-pyparted/python-pyparted.mk
rename to buildroot/package/python-pyparted/python-pyparted.mk
diff --git a/software/package/python-pypcap/Config.in b/buildroot/package/python-pypcap/Config.in
similarity index 100%
rename from software/package/python-pypcap/Config.in
rename to buildroot/package/python-pypcap/Config.in
diff --git a/software/package/python-pypcap/python-pypcap.hash b/buildroot/package/python-pypcap/python-pypcap.hash
similarity index 100%
rename from software/package/python-pypcap/python-pypcap.hash
rename to buildroot/package/python-pypcap/python-pypcap.hash
diff --git a/software/package/python-pypcap/python-pypcap.mk b/buildroot/package/python-pypcap/python-pypcap.mk
similarity index 100%
rename from software/package/python-pypcap/python-pypcap.mk
rename to buildroot/package/python-pypcap/python-pypcap.mk
diff --git a/software/package/python-pyqrcode/Config.in b/buildroot/package/python-pyqrcode/Config.in
similarity index 100%
rename from software/package/python-pyqrcode/Config.in
rename to buildroot/package/python-pyqrcode/Config.in
diff --git a/software/package/python-pyqrcode/python-pyqrcode.hash b/buildroot/package/python-pyqrcode/python-pyqrcode.hash
similarity index 100%
rename from software/package/python-pyqrcode/python-pyqrcode.hash
rename to buildroot/package/python-pyqrcode/python-pyqrcode.hash
diff --git a/software/package/python-pyqrcode/python-pyqrcode.mk b/buildroot/package/python-pyqrcode/python-pyqrcode.mk
similarity index 100%
rename from software/package/python-pyqrcode/python-pyqrcode.mk
rename to buildroot/package/python-pyqrcode/python-pyqrcode.mk
diff --git a/software/package/python-pyqt5/0001-configure-skip-qtdetail.patch b/buildroot/package/python-pyqt5/0001-configure-skip-qtdetail.patch
similarity index 100%
rename from software/package/python-pyqt5/0001-configure-skip-qtdetail.patch
rename to buildroot/package/python-pyqt5/0001-configure-skip-qtdetail.patch
diff --git a/software/package/python-pyqt5/0002-fix-qt-5.6.2.patch b/buildroot/package/python-pyqt5/0002-fix-qt-5.6.2.patch
similarity index 100%
rename from software/package/python-pyqt5/0002-fix-qt-5.6.2.patch
rename to buildroot/package/python-pyqt5/0002-fix-qt-5.6.2.patch
diff --git a/software/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/buildroot/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
similarity index 100%
rename from software/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
rename to buildroot/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
diff --git a/software/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch b/buildroot/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch
similarity index 100%
rename from software/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch
rename to buildroot/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch
diff --git a/software/package/python-pyqt5/Config.in b/buildroot/package/python-pyqt5/Config.in
similarity index 100%
rename from software/package/python-pyqt5/Config.in
rename to buildroot/package/python-pyqt5/Config.in
diff --git a/software/package/python-pyqt5/python-pyqt5.hash b/buildroot/package/python-pyqt5/python-pyqt5.hash
similarity index 100%
rename from software/package/python-pyqt5/python-pyqt5.hash
rename to buildroot/package/python-pyqt5/python-pyqt5.hash
diff --git a/software/package/python-pyqt5/python-pyqt5.mk b/buildroot/package/python-pyqt5/python-pyqt5.mk
similarity index 100%
rename from software/package/python-pyqt5/python-pyqt5.mk
rename to buildroot/package/python-pyqt5/python-pyqt5.mk
diff --git a/software/package/python-pyratemp/Config.in b/buildroot/package/python-pyratemp/Config.in
similarity index 100%
rename from software/package/python-pyratemp/Config.in
rename to buildroot/package/python-pyratemp/Config.in
diff --git a/software/package/python-pyratemp/python-pyratemp.hash b/buildroot/package/python-pyratemp/python-pyratemp.hash
similarity index 100%
rename from software/package/python-pyratemp/python-pyratemp.hash
rename to buildroot/package/python-pyratemp/python-pyratemp.hash
diff --git a/software/package/python-pyratemp/python-pyratemp.mk b/buildroot/package/python-pyratemp/python-pyratemp.mk
similarity index 100%
rename from software/package/python-pyratemp/python-pyratemp.mk
rename to buildroot/package/python-pyratemp/python-pyratemp.mk
diff --git a/software/package/python-pyrex/python-pyrex.hash b/buildroot/package/python-pyrex/python-pyrex.hash
similarity index 100%
rename from software/package/python-pyrex/python-pyrex.hash
rename to buildroot/package/python-pyrex/python-pyrex.hash
diff --git a/software/package/python-pyrex/python-pyrex.mk b/buildroot/package/python-pyrex/python-pyrex.mk
similarity index 100%
rename from software/package/python-pyrex/python-pyrex.mk
rename to buildroot/package/python-pyrex/python-pyrex.mk
diff --git a/software/package/python-pyro/Config.in b/buildroot/package/python-pyro/Config.in
similarity index 100%
rename from software/package/python-pyro/Config.in
rename to buildroot/package/python-pyro/Config.in
diff --git a/software/package/python-pyro/python-pyro.hash b/buildroot/package/python-pyro/python-pyro.hash
similarity index 100%
rename from software/package/python-pyro/python-pyro.hash
rename to buildroot/package/python-pyro/python-pyro.hash
diff --git a/software/package/python-pyro/python-pyro.mk b/buildroot/package/python-pyro/python-pyro.mk
similarity index 100%
rename from software/package/python-pyro/python-pyro.mk
rename to buildroot/package/python-pyro/python-pyro.mk
diff --git a/software/package/python-pyroute2/Config.in b/buildroot/package/python-pyroute2/Config.in
similarity index 100%
rename from software/package/python-pyroute2/Config.in
rename to buildroot/package/python-pyroute2/Config.in
diff --git a/software/package/python-pyroute2/python-pyroute2.hash b/buildroot/package/python-pyroute2/python-pyroute2.hash
similarity index 100%
rename from software/package/python-pyroute2/python-pyroute2.hash
rename to buildroot/package/python-pyroute2/python-pyroute2.hash
diff --git a/software/package/python-pyroute2/python-pyroute2.mk b/buildroot/package/python-pyroute2/python-pyroute2.mk
similarity index 100%
rename from software/package/python-pyroute2/python-pyroute2.mk
rename to buildroot/package/python-pyroute2/python-pyroute2.mk
diff --git a/software/package/python-pysendfile/Config.in b/buildroot/package/python-pysendfile/Config.in
similarity index 100%
rename from software/package/python-pysendfile/Config.in
rename to buildroot/package/python-pysendfile/Config.in
diff --git a/software/package/python-pysendfile/python-pysendfile.hash b/buildroot/package/python-pysendfile/python-pysendfile.hash
similarity index 100%
rename from software/package/python-pysendfile/python-pysendfile.hash
rename to buildroot/package/python-pysendfile/python-pysendfile.hash
diff --git a/software/package/python-pysendfile/python-pysendfile.mk b/buildroot/package/python-pysendfile/python-pysendfile.mk
similarity index 100%
rename from software/package/python-pysendfile/python-pysendfile.mk
rename to buildroot/package/python-pysendfile/python-pysendfile.mk
diff --git a/software/package/python-pysmb/Config.in b/buildroot/package/python-pysmb/Config.in
similarity index 100%
rename from software/package/python-pysmb/Config.in
rename to buildroot/package/python-pysmb/Config.in
diff --git a/software/package/python-pysmb/python-pysmb.hash b/buildroot/package/python-pysmb/python-pysmb.hash
similarity index 100%
rename from software/package/python-pysmb/python-pysmb.hash
rename to buildroot/package/python-pysmb/python-pysmb.hash
diff --git a/software/package/python-pysmb/python-pysmb.mk b/buildroot/package/python-pysmb/python-pysmb.mk
similarity index 100%
rename from software/package/python-pysmb/python-pysmb.mk
rename to buildroot/package/python-pysmb/python-pysmb.mk
diff --git a/software/package/python-pysmi/Config.in b/buildroot/package/python-pysmi/Config.in
similarity index 100%
rename from software/package/python-pysmi/Config.in
rename to buildroot/package/python-pysmi/Config.in
diff --git a/software/package/python-pysmi/python-pysmi.hash b/buildroot/package/python-pysmi/python-pysmi.hash
similarity index 100%
rename from software/package/python-pysmi/python-pysmi.hash
rename to buildroot/package/python-pysmi/python-pysmi.hash
diff --git a/software/package/python-pysmi/python-pysmi.mk b/buildroot/package/python-pysmi/python-pysmi.mk
similarity index 100%
rename from software/package/python-pysmi/python-pysmi.mk
rename to buildroot/package/python-pysmi/python-pysmi.mk
diff --git a/software/package/python-pysnmp-mibs/Config.in b/buildroot/package/python-pysnmp-mibs/Config.in
similarity index 100%
rename from software/package/python-pysnmp-mibs/Config.in
rename to buildroot/package/python-pysnmp-mibs/Config.in
diff --git a/software/package/python-pysnmp-mibs/python-pysnmp-mibs.hash b/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.hash
similarity index 100%
rename from software/package/python-pysnmp-mibs/python-pysnmp-mibs.hash
rename to buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.hash
diff --git a/software/package/python-pysnmp-mibs/python-pysnmp-mibs.mk b/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
similarity index 100%
rename from software/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
rename to buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
diff --git a/software/package/python-pysnmp/Config.in b/buildroot/package/python-pysnmp/Config.in
similarity index 100%
rename from software/package/python-pysnmp/Config.in
rename to buildroot/package/python-pysnmp/Config.in
diff --git a/software/package/python-pysnmp/python-pysnmp.hash b/buildroot/package/python-pysnmp/python-pysnmp.hash
similarity index 100%
rename from software/package/python-pysnmp/python-pysnmp.hash
rename to buildroot/package/python-pysnmp/python-pysnmp.hash
diff --git a/software/package/python-pysnmp/python-pysnmp.mk b/buildroot/package/python-pysnmp/python-pysnmp.mk
similarity index 100%
rename from software/package/python-pysnmp/python-pysnmp.mk
rename to buildroot/package/python-pysnmp/python-pysnmp.mk
diff --git a/software/package/python-pysocks/Config.in b/buildroot/package/python-pysocks/Config.in
similarity index 100%
rename from software/package/python-pysocks/Config.in
rename to buildroot/package/python-pysocks/Config.in
diff --git a/software/package/python-pysocks/python-pysocks.hash b/buildroot/package/python-pysocks/python-pysocks.hash
similarity index 100%
rename from software/package/python-pysocks/python-pysocks.hash
rename to buildroot/package/python-pysocks/python-pysocks.hash
diff --git a/software/package/python-pysocks/python-pysocks.mk b/buildroot/package/python-pysocks/python-pysocks.mk
similarity index 100%
rename from software/package/python-pysocks/python-pysocks.mk
rename to buildroot/package/python-pysocks/python-pysocks.mk
diff --git a/software/package/python-pytablereader/Config.in b/buildroot/package/python-pytablereader/Config.in
similarity index 100%
rename from software/package/python-pytablereader/Config.in
rename to buildroot/package/python-pytablereader/Config.in
diff --git a/software/package/python-pytablereader/python-pytablereader.hash b/buildroot/package/python-pytablereader/python-pytablereader.hash
similarity index 100%
rename from software/package/python-pytablereader/python-pytablereader.hash
rename to buildroot/package/python-pytablereader/python-pytablereader.hash
diff --git a/software/package/python-pytablereader/python-pytablereader.mk b/buildroot/package/python-pytablereader/python-pytablereader.mk
similarity index 100%
rename from software/package/python-pytablereader/python-pytablereader.mk
rename to buildroot/package/python-pytablereader/python-pytablereader.mk
diff --git a/software/package/python-pytablewriter/Config.in b/buildroot/package/python-pytablewriter/Config.in
similarity index 100%
rename from software/package/python-pytablewriter/Config.in
rename to buildroot/package/python-pytablewriter/Config.in
diff --git a/software/package/python-pytablewriter/python-pytablewriter.hash b/buildroot/package/python-pytablewriter/python-pytablewriter.hash
similarity index 100%
rename from software/package/python-pytablewriter/python-pytablewriter.hash
rename to buildroot/package/python-pytablewriter/python-pytablewriter.hash
diff --git a/software/package/python-pytablewriter/python-pytablewriter.mk b/buildroot/package/python-pytablewriter/python-pytablewriter.mk
similarity index 100%
rename from software/package/python-pytablewriter/python-pytablewriter.mk
rename to buildroot/package/python-pytablewriter/python-pytablewriter.mk
diff --git a/software/package/python-pytrie/Config.in b/buildroot/package/python-pytrie/Config.in
similarity index 100%
rename from software/package/python-pytrie/Config.in
rename to buildroot/package/python-pytrie/Config.in
diff --git a/software/package/python-pytrie/python-pytrie.hash b/buildroot/package/python-pytrie/python-pytrie.hash
similarity index 100%
rename from software/package/python-pytrie/python-pytrie.hash
rename to buildroot/package/python-pytrie/python-pytrie.hash
diff --git a/software/package/python-pytrie/python-pytrie.mk b/buildroot/package/python-pytrie/python-pytrie.mk
similarity index 100%
rename from software/package/python-pytrie/python-pytrie.mk
rename to buildroot/package/python-pytrie/python-pytrie.mk
diff --git a/software/package/python-pytz/Config.in b/buildroot/package/python-pytz/Config.in
similarity index 100%
rename from software/package/python-pytz/Config.in
rename to buildroot/package/python-pytz/Config.in
diff --git a/software/package/python-pytz/python-pytz.hash b/buildroot/package/python-pytz/python-pytz.hash
similarity index 100%
rename from software/package/python-pytz/python-pytz.hash
rename to buildroot/package/python-pytz/python-pytz.hash
diff --git a/software/package/python-pytz/python-pytz.mk b/buildroot/package/python-pytz/python-pytz.mk
similarity index 100%
rename from software/package/python-pytz/python-pytz.mk
rename to buildroot/package/python-pytz/python-pytz.mk
diff --git a/software/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/buildroot/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch
similarity index 100%
rename from software/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch
rename to buildroot/package/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch
diff --git a/software/package/python-pyudev/Config.in b/buildroot/package/python-pyudev/Config.in
similarity index 100%
rename from software/package/python-pyudev/Config.in
rename to buildroot/package/python-pyudev/Config.in
diff --git a/software/package/python-pyudev/python-pyudev.hash b/buildroot/package/python-pyudev/python-pyudev.hash
similarity index 100%
rename from software/package/python-pyudev/python-pyudev.hash
rename to buildroot/package/python-pyudev/python-pyudev.hash
diff --git a/software/package/python-pyudev/python-pyudev.mk b/buildroot/package/python-pyudev/python-pyudev.mk
similarity index 100%
rename from software/package/python-pyudev/python-pyudev.mk
rename to buildroot/package/python-pyudev/python-pyudev.mk
diff --git a/software/package/python-pyusb/Config.in b/buildroot/package/python-pyusb/Config.in
similarity index 100%
rename from software/package/python-pyusb/Config.in
rename to buildroot/package/python-pyusb/Config.in
diff --git a/software/package/python-pyusb/python-pyusb.hash b/buildroot/package/python-pyusb/python-pyusb.hash
similarity index 100%
rename from software/package/python-pyusb/python-pyusb.hash
rename to buildroot/package/python-pyusb/python-pyusb.hash
diff --git a/software/package/python-pyusb/python-pyusb.mk b/buildroot/package/python-pyusb/python-pyusb.mk
similarity index 100%
rename from software/package/python-pyusb/python-pyusb.mk
rename to buildroot/package/python-pyusb/python-pyusb.mk
diff --git a/software/package/python-pyxb/Config.in b/buildroot/package/python-pyxb/Config.in
similarity index 100%
rename from software/package/python-pyxb/Config.in
rename to buildroot/package/python-pyxb/Config.in
diff --git a/software/package/python-pyxb/python-pyxb.hash b/buildroot/package/python-pyxb/python-pyxb.hash
similarity index 100%
rename from software/package/python-pyxb/python-pyxb.hash
rename to buildroot/package/python-pyxb/python-pyxb.hash
diff --git a/software/package/python-pyxb/python-pyxb.mk b/buildroot/package/python-pyxb/python-pyxb.mk
similarity index 100%
rename from software/package/python-pyxb/python-pyxb.mk
rename to buildroot/package/python-pyxb/python-pyxb.mk
diff --git a/software/package/python-pyyaml/Config.in b/buildroot/package/python-pyyaml/Config.in
similarity index 100%
rename from software/package/python-pyyaml/Config.in
rename to buildroot/package/python-pyyaml/Config.in
diff --git a/software/package/python-pyyaml/python-pyyaml.hash b/buildroot/package/python-pyyaml/python-pyyaml.hash
similarity index 100%
rename from software/package/python-pyyaml/python-pyyaml.hash
rename to buildroot/package/python-pyyaml/python-pyyaml.hash
diff --git a/software/package/python-pyyaml/python-pyyaml.mk b/buildroot/package/python-pyyaml/python-pyyaml.mk
similarity index 100%
rename from software/package/python-pyyaml/python-pyyaml.mk
rename to buildroot/package/python-pyyaml/python-pyyaml.mk
diff --git a/software/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/buildroot/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch
similarity index 100%
rename from software/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch
rename to buildroot/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch
diff --git a/software/package/python-pyzmq/Config.in b/buildroot/package/python-pyzmq/Config.in
similarity index 100%
rename from software/package/python-pyzmq/Config.in
rename to buildroot/package/python-pyzmq/Config.in
diff --git a/software/package/python-pyzmq/python-pyzmq.hash b/buildroot/package/python-pyzmq/python-pyzmq.hash
similarity index 100%
rename from software/package/python-pyzmq/python-pyzmq.hash
rename to buildroot/package/python-pyzmq/python-pyzmq.hash
diff --git a/software/package/python-pyzmq/python-pyzmq.mk b/buildroot/package/python-pyzmq/python-pyzmq.mk
similarity index 100%
rename from software/package/python-pyzmq/python-pyzmq.mk
rename to buildroot/package/python-pyzmq/python-pyzmq.mk
diff --git a/software/package/python-raven/Config.in b/buildroot/package/python-raven/Config.in
similarity index 100%
rename from software/package/python-raven/Config.in
rename to buildroot/package/python-raven/Config.in
diff --git a/software/package/python-raven/python-raven.hash b/buildroot/package/python-raven/python-raven.hash
similarity index 100%
rename from software/package/python-raven/python-raven.hash
rename to buildroot/package/python-raven/python-raven.hash
diff --git a/software/package/python-raven/python-raven.mk b/buildroot/package/python-raven/python-raven.mk
similarity index 100%
rename from software/package/python-raven/python-raven.mk
rename to buildroot/package/python-raven/python-raven.mk
diff --git a/software/package/python-redis/Config.in b/buildroot/package/python-redis/Config.in
similarity index 100%
rename from software/package/python-redis/Config.in
rename to buildroot/package/python-redis/Config.in
diff --git a/software/package/python-redis/python-redis.hash b/buildroot/package/python-redis/python-redis.hash
similarity index 100%
rename from software/package/python-redis/python-redis.hash
rename to buildroot/package/python-redis/python-redis.hash
diff --git a/software/package/python-redis/python-redis.mk b/buildroot/package/python-redis/python-redis.mk
similarity index 100%
rename from software/package/python-redis/python-redis.mk
rename to buildroot/package/python-redis/python-redis.mk
diff --git a/software/package/python-reentry/Config.in b/buildroot/package/python-reentry/Config.in
similarity index 100%
rename from software/package/python-reentry/Config.in
rename to buildroot/package/python-reentry/Config.in
diff --git a/software/package/python-reentry/python-reentry.hash b/buildroot/package/python-reentry/python-reentry.hash
similarity index 100%
rename from software/package/python-reentry/python-reentry.hash
rename to buildroot/package/python-reentry/python-reentry.hash
diff --git a/software/package/python-reentry/python-reentry.mk b/buildroot/package/python-reentry/python-reentry.mk
similarity index 100%
rename from software/package/python-reentry/python-reentry.mk
rename to buildroot/package/python-reentry/python-reentry.mk
diff --git a/software/package/python-remi/Config.in b/buildroot/package/python-remi/Config.in
similarity index 100%
rename from software/package/python-remi/Config.in
rename to buildroot/package/python-remi/Config.in
diff --git a/software/package/python-remi/python-remi.hash b/buildroot/package/python-remi/python-remi.hash
similarity index 100%
rename from software/package/python-remi/python-remi.hash
rename to buildroot/package/python-remi/python-remi.hash
diff --git a/software/package/python-remi/python-remi.mk b/buildroot/package/python-remi/python-remi.mk
similarity index 100%
rename from software/package/python-remi/python-remi.mk
rename to buildroot/package/python-remi/python-remi.mk
diff --git a/software/package/python-request-id/Config.in b/buildroot/package/python-request-id/Config.in
similarity index 100%
rename from software/package/python-request-id/Config.in
rename to buildroot/package/python-request-id/Config.in
diff --git a/software/package/python-request-id/python-request-id.hash b/buildroot/package/python-request-id/python-request-id.hash
similarity index 100%
rename from software/package/python-request-id/python-request-id.hash
rename to buildroot/package/python-request-id/python-request-id.hash
diff --git a/software/package/python-request-id/python-request-id.mk b/buildroot/package/python-request-id/python-request-id.mk
similarity index 100%
rename from software/package/python-request-id/python-request-id.mk
rename to buildroot/package/python-request-id/python-request-id.mk
diff --git a/software/package/python-requests-oauthlib/Config.in b/buildroot/package/python-requests-oauthlib/Config.in
similarity index 100%
rename from software/package/python-requests-oauthlib/Config.in
rename to buildroot/package/python-requests-oauthlib/Config.in
diff --git a/software/package/python-requests-oauthlib/python-requests-oauthlib.hash b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash
similarity index 100%
rename from software/package/python-requests-oauthlib/python-requests-oauthlib.hash
rename to buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash
diff --git a/software/package/python-requests-oauthlib/python-requests-oauthlib.mk b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk
similarity index 100%
rename from software/package/python-requests-oauthlib/python-requests-oauthlib.mk
rename to buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk
diff --git a/software/package/python-requests-toolbelt/Config.in b/buildroot/package/python-requests-toolbelt/Config.in
similarity index 100%
rename from software/package/python-requests-toolbelt/Config.in
rename to buildroot/package/python-requests-toolbelt/Config.in
diff --git a/software/package/python-requests-toolbelt/python-requests-toolbelt.hash b/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash
similarity index 100%
rename from software/package/python-requests-toolbelt/python-requests-toolbelt.hash
rename to buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash
diff --git a/software/package/python-requests-toolbelt/python-requests-toolbelt.mk b/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk
similarity index 100%
rename from software/package/python-requests-toolbelt/python-requests-toolbelt.mk
rename to buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk
diff --git a/software/package/python-requests/Config.in b/buildroot/package/python-requests/Config.in
similarity index 100%
rename from software/package/python-requests/Config.in
rename to buildroot/package/python-requests/Config.in
diff --git a/software/package/python-requests/python-requests.hash b/buildroot/package/python-requests/python-requests.hash
similarity index 100%
rename from software/package/python-requests/python-requests.hash
rename to buildroot/package/python-requests/python-requests.hash
diff --git a/software/package/python-requests/python-requests.mk b/buildroot/package/python-requests/python-requests.mk
similarity index 100%
rename from software/package/python-requests/python-requests.mk
rename to buildroot/package/python-requests/python-requests.mk
diff --git a/software/package/python-rpi-gpio/Config.in b/buildroot/package/python-rpi-gpio/Config.in
similarity index 100%
rename from software/package/python-rpi-gpio/Config.in
rename to buildroot/package/python-rpi-gpio/Config.in
diff --git a/software/package/python-rpi-gpio/python-rpi-gpio.hash b/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash
similarity index 100%
rename from software/package/python-rpi-gpio/python-rpi-gpio.hash
rename to buildroot/package/python-rpi-gpio/python-rpi-gpio.hash
diff --git a/software/package/python-rpi-gpio/python-rpi-gpio.mk b/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk
similarity index 100%
rename from software/package/python-rpi-gpio/python-rpi-gpio.mk
rename to buildroot/package/python-rpi-gpio/python-rpi-gpio.mk
diff --git a/software/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch b/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch
similarity index 100%
rename from software/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch
rename to buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch
diff --git a/software/package/python-rpi-ws281x/Config.in b/buildroot/package/python-rpi-ws281x/Config.in
similarity index 100%
rename from software/package/python-rpi-ws281x/Config.in
rename to buildroot/package/python-rpi-ws281x/Config.in
diff --git a/software/package/python-rpi-ws281x/python-rpi-ws281x.hash b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash
similarity index 100%
rename from software/package/python-rpi-ws281x/python-rpi-ws281x.hash
rename to buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash
diff --git a/software/package/python-rpi-ws281x/python-rpi-ws281x.mk b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk
similarity index 100%
rename from software/package/python-rpi-ws281x/python-rpi-ws281x.mk
rename to buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk
diff --git a/software/package/python-rtslib-fb/Config.in b/buildroot/package/python-rtslib-fb/Config.in
similarity index 100%
rename from software/package/python-rtslib-fb/Config.in
rename to buildroot/package/python-rtslib-fb/Config.in
diff --git a/software/package/python-rtslib-fb/python-rtslib-fb.hash b/buildroot/package/python-rtslib-fb/python-rtslib-fb.hash
similarity index 100%
rename from software/package/python-rtslib-fb/python-rtslib-fb.hash
rename to buildroot/package/python-rtslib-fb/python-rtslib-fb.hash
diff --git a/software/package/python-rtslib-fb/python-rtslib-fb.mk b/buildroot/package/python-rtslib-fb/python-rtslib-fb.mk
similarity index 100%
rename from software/package/python-rtslib-fb/python-rtslib-fb.mk
rename to buildroot/package/python-rtslib-fb/python-rtslib-fb.mk
diff --git a/software/package/python-scandir/Config.in b/buildroot/package/python-scandir/Config.in
similarity index 100%
rename from software/package/python-scandir/Config.in
rename to buildroot/package/python-scandir/Config.in
diff --git a/software/package/python-scandir/python-scandir.hash b/buildroot/package/python-scandir/python-scandir.hash
similarity index 100%
rename from software/package/python-scandir/python-scandir.hash
rename to buildroot/package/python-scandir/python-scandir.hash
diff --git a/software/package/python-scandir/python-scandir.mk b/buildroot/package/python-scandir/python-scandir.mk
similarity index 100%
rename from software/package/python-scandir/python-scandir.mk
rename to buildroot/package/python-scandir/python-scandir.mk
diff --git a/software/package/python-scapy/0001-Small-Python-2-fix.patch b/buildroot/package/python-scapy/0001-Small-Python-2-fix.patch
similarity index 100%
rename from software/package/python-scapy/0001-Small-Python-2-fix.patch
rename to buildroot/package/python-scapy/0001-Small-Python-2-fix.patch
diff --git a/software/package/python-scapy/Config.in b/buildroot/package/python-scapy/Config.in
similarity index 100%
rename from software/package/python-scapy/Config.in
rename to buildroot/package/python-scapy/Config.in
diff --git a/software/package/python-scapy/python-scapy.hash b/buildroot/package/python-scapy/python-scapy.hash
similarity index 100%
rename from software/package/python-scapy/python-scapy.hash
rename to buildroot/package/python-scapy/python-scapy.hash
diff --git a/software/package/python-scapy/python-scapy.mk b/buildroot/package/python-scapy/python-scapy.mk
similarity index 100%
rename from software/package/python-scapy/python-scapy.mk
rename to buildroot/package/python-scapy/python-scapy.mk
diff --git a/software/package/python-schedule/Config.in b/buildroot/package/python-schedule/Config.in
similarity index 100%
rename from software/package/python-schedule/Config.in
rename to buildroot/package/python-schedule/Config.in
diff --git a/software/package/python-schedule/python-schedule.hash b/buildroot/package/python-schedule/python-schedule.hash
similarity index 100%
rename from software/package/python-schedule/python-schedule.hash
rename to buildroot/package/python-schedule/python-schedule.hash
diff --git a/software/package/python-schedule/python-schedule.mk b/buildroot/package/python-schedule/python-schedule.mk
similarity index 100%
rename from software/package/python-schedule/python-schedule.mk
rename to buildroot/package/python-schedule/python-schedule.mk
diff --git a/software/package/python-sdnotify/Config.in b/buildroot/package/python-sdnotify/Config.in
similarity index 100%
rename from software/package/python-sdnotify/Config.in
rename to buildroot/package/python-sdnotify/Config.in
diff --git a/software/package/python-sdnotify/python-sdnotify.hash b/buildroot/package/python-sdnotify/python-sdnotify.hash
similarity index 100%
rename from software/package/python-sdnotify/python-sdnotify.hash
rename to buildroot/package/python-sdnotify/python-sdnotify.hash
diff --git a/software/package/python-sdnotify/python-sdnotify.mk b/buildroot/package/python-sdnotify/python-sdnotify.mk
similarity index 100%
rename from software/package/python-sdnotify/python-sdnotify.mk
rename to buildroot/package/python-sdnotify/python-sdnotify.mk
diff --git a/software/package/python-secretstorage/Config.in b/buildroot/package/python-secretstorage/Config.in
similarity index 100%
rename from software/package/python-secretstorage/Config.in
rename to buildroot/package/python-secretstorage/Config.in
diff --git a/software/package/python-secretstorage/python-secretstorage.hash b/buildroot/package/python-secretstorage/python-secretstorage.hash
similarity index 100%
rename from software/package/python-secretstorage/python-secretstorage.hash
rename to buildroot/package/python-secretstorage/python-secretstorage.hash
diff --git a/software/package/python-secretstorage/python-secretstorage.mk b/buildroot/package/python-secretstorage/python-secretstorage.mk
similarity index 100%
rename from software/package/python-secretstorage/python-secretstorage.mk
rename to buildroot/package/python-secretstorage/python-secretstorage.mk
diff --git a/software/package/python-see/Config.in b/buildroot/package/python-see/Config.in
similarity index 100%
rename from software/package/python-see/Config.in
rename to buildroot/package/python-see/Config.in
diff --git a/software/package/python-see/python-see.hash b/buildroot/package/python-see/python-see.hash
similarity index 100%
rename from software/package/python-see/python-see.hash
rename to buildroot/package/python-see/python-see.hash
diff --git a/software/package/python-see/python-see.mk b/buildroot/package/python-see/python-see.mk
similarity index 100%
rename from software/package/python-see/python-see.mk
rename to buildroot/package/python-see/python-see.mk
diff --git a/software/package/python-semver/Config.in b/buildroot/package/python-semver/Config.in
similarity index 100%
rename from software/package/python-semver/Config.in
rename to buildroot/package/python-semver/Config.in
diff --git a/software/package/python-semver/python-semver.hash b/buildroot/package/python-semver/python-semver.hash
similarity index 100%
rename from software/package/python-semver/python-semver.hash
rename to buildroot/package/python-semver/python-semver.hash
diff --git a/software/package/python-semver/python-semver.mk b/buildroot/package/python-semver/python-semver.mk
similarity index 100%
rename from software/package/python-semver/python-semver.mk
rename to buildroot/package/python-semver/python-semver.mk
diff --git a/software/package/python-sentry-sdk/Config.in b/buildroot/package/python-sentry-sdk/Config.in
similarity index 100%
rename from software/package/python-sentry-sdk/Config.in
rename to buildroot/package/python-sentry-sdk/Config.in
diff --git a/software/package/python-sentry-sdk/python-sentry-sdk.hash b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash
similarity index 100%
rename from software/package/python-sentry-sdk/python-sentry-sdk.hash
rename to buildroot/package/python-sentry-sdk/python-sentry-sdk.hash
diff --git a/software/package/python-sentry-sdk/python-sentry-sdk.mk b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk
similarity index 100%
rename from software/package/python-sentry-sdk/python-sentry-sdk.mk
rename to buildroot/package/python-sentry-sdk/python-sentry-sdk.mk
diff --git a/software/package/python-serial-asyncio/Config.in b/buildroot/package/python-serial-asyncio/Config.in
similarity index 100%
rename from software/package/python-serial-asyncio/Config.in
rename to buildroot/package/python-serial-asyncio/Config.in
diff --git a/software/package/python-serial-asyncio/python-serial-asyncio.hash b/buildroot/package/python-serial-asyncio/python-serial-asyncio.hash
similarity index 100%
rename from software/package/python-serial-asyncio/python-serial-asyncio.hash
rename to buildroot/package/python-serial-asyncio/python-serial-asyncio.hash
diff --git a/software/package/python-serial-asyncio/python-serial-asyncio.mk b/buildroot/package/python-serial-asyncio/python-serial-asyncio.mk
similarity index 100%
rename from software/package/python-serial-asyncio/python-serial-asyncio.mk
rename to buildroot/package/python-serial-asyncio/python-serial-asyncio.mk
diff --git a/software/package/python-serial/Config.in b/buildroot/package/python-serial/Config.in
similarity index 100%
rename from software/package/python-serial/Config.in
rename to buildroot/package/python-serial/Config.in
diff --git a/software/package/python-serial/python-serial.hash b/buildroot/package/python-serial/python-serial.hash
similarity index 100%
rename from software/package/python-serial/python-serial.hash
rename to buildroot/package/python-serial/python-serial.hash
diff --git a/software/package/python-serial/python-serial.mk b/buildroot/package/python-serial/python-serial.mk
similarity index 100%
rename from software/package/python-serial/python-serial.mk
rename to buildroot/package/python-serial/python-serial.mk
diff --git a/software/package/python-service-identity/Config.in b/buildroot/package/python-service-identity/Config.in
similarity index 100%
rename from software/package/python-service-identity/Config.in
rename to buildroot/package/python-service-identity/Config.in
diff --git a/software/package/python-service-identity/python-service-identity.hash b/buildroot/package/python-service-identity/python-service-identity.hash
similarity index 100%
rename from software/package/python-service-identity/python-service-identity.hash
rename to buildroot/package/python-service-identity/python-service-identity.hash
diff --git a/software/package/python-service-identity/python-service-identity.mk b/buildroot/package/python-service-identity/python-service-identity.mk
similarity index 100%
rename from software/package/python-service-identity/python-service-identity.mk
rename to buildroot/package/python-service-identity/python-service-identity.mk
diff --git a/software/package/python-setproctitle/Config.in b/buildroot/package/python-setproctitle/Config.in
similarity index 100%
rename from software/package/python-setproctitle/Config.in
rename to buildroot/package/python-setproctitle/Config.in
diff --git a/software/package/python-setproctitle/python-setproctitle.hash b/buildroot/package/python-setproctitle/python-setproctitle.hash
similarity index 100%
rename from software/package/python-setproctitle/python-setproctitle.hash
rename to buildroot/package/python-setproctitle/python-setproctitle.hash
diff --git a/software/package/python-setproctitle/python-setproctitle.mk b/buildroot/package/python-setproctitle/python-setproctitle.mk
similarity index 100%
rename from software/package/python-setproctitle/python-setproctitle.mk
rename to buildroot/package/python-setproctitle/python-setproctitle.mk
diff --git a/software/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash
similarity index 100%
rename from software/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash
rename to buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash
diff --git a/software/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk
similarity index 100%
rename from software/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk
rename to buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk
diff --git a/software/package/python-setuptools-scm/python-setuptools-scm.hash b/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash
similarity index 100%
rename from software/package/python-setuptools-scm/python-setuptools-scm.hash
rename to buildroot/package/python-setuptools-scm/python-setuptools-scm.hash
diff --git a/software/package/python-setuptools-scm/python-setuptools-scm.mk b/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk
similarity index 100%
rename from software/package/python-setuptools-scm/python-setuptools-scm.mk
rename to buildroot/package/python-setuptools-scm/python-setuptools-scm.mk
diff --git a/software/package/python-setuptools/0001-add-executable.patch b/buildroot/package/python-setuptools/0001-add-executable.patch
similarity index 100%
rename from software/package/python-setuptools/0001-add-executable.patch
rename to buildroot/package/python-setuptools/0001-add-executable.patch
diff --git a/software/package/python-setuptools/Config.in b/buildroot/package/python-setuptools/Config.in
similarity index 100%
rename from software/package/python-setuptools/Config.in
rename to buildroot/package/python-setuptools/Config.in
diff --git a/software/package/python-setuptools/python-setuptools.hash b/buildroot/package/python-setuptools/python-setuptools.hash
similarity index 100%
rename from software/package/python-setuptools/python-setuptools.hash
rename to buildroot/package/python-setuptools/python-setuptools.hash
diff --git a/software/package/python-setuptools/python-setuptools.mk b/buildroot/package/python-setuptools/python-setuptools.mk
similarity index 100%
rename from software/package/python-setuptools/python-setuptools.mk
rename to buildroot/package/python-setuptools/python-setuptools.mk
diff --git a/software/package/python-sh/Config.in b/buildroot/package/python-sh/Config.in
similarity index 100%
rename from software/package/python-sh/Config.in
rename to buildroot/package/python-sh/Config.in
diff --git a/software/package/python-sh/python-sh.hash b/buildroot/package/python-sh/python-sh.hash
similarity index 100%
rename from software/package/python-sh/python-sh.hash
rename to buildroot/package/python-sh/python-sh.hash
diff --git a/software/package/python-sh/python-sh.mk b/buildroot/package/python-sh/python-sh.mk
similarity index 100%
rename from software/package/python-sh/python-sh.mk
rename to buildroot/package/python-sh/python-sh.mk
diff --git a/software/package/python-shutilwhich/Config.in b/buildroot/package/python-shutilwhich/Config.in
similarity index 100%
rename from software/package/python-shutilwhich/Config.in
rename to buildroot/package/python-shutilwhich/Config.in
diff --git a/software/package/python-shutilwhich/python-shutilwhich.hash b/buildroot/package/python-shutilwhich/python-shutilwhich.hash
similarity index 100%
rename from software/package/python-shutilwhich/python-shutilwhich.hash
rename to buildroot/package/python-shutilwhich/python-shutilwhich.hash
diff --git a/software/package/python-shutilwhich/python-shutilwhich.mk b/buildroot/package/python-shutilwhich/python-shutilwhich.mk
similarity index 100%
rename from software/package/python-shutilwhich/python-shutilwhich.mk
rename to buildroot/package/python-shutilwhich/python-shutilwhich.mk
diff --git a/software/package/python-simpleaudio/Config.in b/buildroot/package/python-simpleaudio/Config.in
similarity index 100%
rename from software/package/python-simpleaudio/Config.in
rename to buildroot/package/python-simpleaudio/Config.in
diff --git a/software/package/python-simpleaudio/python-simpleaudio.hash b/buildroot/package/python-simpleaudio/python-simpleaudio.hash
similarity index 100%
rename from software/package/python-simpleaudio/python-simpleaudio.hash
rename to buildroot/package/python-simpleaudio/python-simpleaudio.hash
diff --git a/software/package/python-simpleaudio/python-simpleaudio.mk b/buildroot/package/python-simpleaudio/python-simpleaudio.mk
similarity index 100%
rename from software/package/python-simpleaudio/python-simpleaudio.mk
rename to buildroot/package/python-simpleaudio/python-simpleaudio.mk
diff --git a/software/package/python-simplegeneric/Config.in b/buildroot/package/python-simplegeneric/Config.in
similarity index 100%
rename from software/package/python-simplegeneric/Config.in
rename to buildroot/package/python-simplegeneric/Config.in
diff --git a/software/package/python-simplegeneric/python-simplegeneric.hash b/buildroot/package/python-simplegeneric/python-simplegeneric.hash
similarity index 100%
rename from software/package/python-simplegeneric/python-simplegeneric.hash
rename to buildroot/package/python-simplegeneric/python-simplegeneric.hash
diff --git a/software/package/python-simplegeneric/python-simplegeneric.mk b/buildroot/package/python-simplegeneric/python-simplegeneric.mk
similarity index 100%
rename from software/package/python-simplegeneric/python-simplegeneric.mk
rename to buildroot/package/python-simplegeneric/python-simplegeneric.mk
diff --git a/software/package/python-simplejson/Config.in b/buildroot/package/python-simplejson/Config.in
similarity index 100%
rename from software/package/python-simplejson/Config.in
rename to buildroot/package/python-simplejson/Config.in
diff --git a/software/package/python-simplejson/python-simplejson.hash b/buildroot/package/python-simplejson/python-simplejson.hash
similarity index 100%
rename from software/package/python-simplejson/python-simplejson.hash
rename to buildroot/package/python-simplejson/python-simplejson.hash
diff --git a/software/package/python-simplejson/python-simplejson.mk b/buildroot/package/python-simplejson/python-simplejson.mk
similarity index 100%
rename from software/package/python-simplejson/python-simplejson.mk
rename to buildroot/package/python-simplejson/python-simplejson.mk
diff --git a/software/package/python-simplelogging/Config.in b/buildroot/package/python-simplelogging/Config.in
similarity index 100%
rename from software/package/python-simplelogging/Config.in
rename to buildroot/package/python-simplelogging/Config.in
diff --git a/software/package/python-simplelogging/python-simplelogging.hash b/buildroot/package/python-simplelogging/python-simplelogging.hash
similarity index 100%
rename from software/package/python-simplelogging/python-simplelogging.hash
rename to buildroot/package/python-simplelogging/python-simplelogging.hash
diff --git a/software/package/python-simplelogging/python-simplelogging.mk b/buildroot/package/python-simplelogging/python-simplelogging.mk
similarity index 100%
rename from software/package/python-simplelogging/python-simplelogging.mk
rename to buildroot/package/python-simplelogging/python-simplelogging.mk
diff --git a/software/package/python-simplesqlite/Config.in b/buildroot/package/python-simplesqlite/Config.in
similarity index 100%
rename from software/package/python-simplesqlite/Config.in
rename to buildroot/package/python-simplesqlite/Config.in
diff --git a/software/package/python-simplesqlite/python-simplesqlite.hash b/buildroot/package/python-simplesqlite/python-simplesqlite.hash
similarity index 100%
rename from software/package/python-simplesqlite/python-simplesqlite.hash
rename to buildroot/package/python-simplesqlite/python-simplesqlite.hash
diff --git a/software/package/python-simplesqlite/python-simplesqlite.mk b/buildroot/package/python-simplesqlite/python-simplesqlite.mk
similarity index 100%
rename from software/package/python-simplesqlite/python-simplesqlite.mk
rename to buildroot/package/python-simplesqlite/python-simplesqlite.mk
diff --git a/software/package/python-singledispatch/Config.in b/buildroot/package/python-singledispatch/Config.in
similarity index 100%
rename from software/package/python-singledispatch/Config.in
rename to buildroot/package/python-singledispatch/Config.in
diff --git a/software/package/python-singledispatch/python-singledispatch.hash b/buildroot/package/python-singledispatch/python-singledispatch.hash
similarity index 100%
rename from software/package/python-singledispatch/python-singledispatch.hash
rename to buildroot/package/python-singledispatch/python-singledispatch.hash
diff --git a/software/package/python-singledispatch/python-singledispatch.mk b/buildroot/package/python-singledispatch/python-singledispatch.mk
similarity index 100%
rename from software/package/python-singledispatch/python-singledispatch.mk
rename to buildroot/package/python-singledispatch/python-singledispatch.mk
diff --git a/software/package/python-sip/Config.in b/buildroot/package/python-sip/Config.in
similarity index 100%
rename from software/package/python-sip/Config.in
rename to buildroot/package/python-sip/Config.in
diff --git a/software/package/python-sip/python-sip.hash b/buildroot/package/python-sip/python-sip.hash
similarity index 100%
rename from software/package/python-sip/python-sip.hash
rename to buildroot/package/python-sip/python-sip.hash
diff --git a/software/package/python-sip/python-sip.mk b/buildroot/package/python-sip/python-sip.mk
similarity index 100%
rename from software/package/python-sip/python-sip.mk
rename to buildroot/package/python-sip/python-sip.mk
diff --git a/software/package/python-six/Config.in b/buildroot/package/python-six/Config.in
similarity index 100%
rename from software/package/python-six/Config.in
rename to buildroot/package/python-six/Config.in
diff --git a/software/package/python-six/Config.in.host b/buildroot/package/python-six/Config.in.host
similarity index 100%
rename from software/package/python-six/Config.in.host
rename to buildroot/package/python-six/Config.in.host
diff --git a/software/package/python-six/python-six.hash b/buildroot/package/python-six/python-six.hash
similarity index 100%
rename from software/package/python-six/python-six.hash
rename to buildroot/package/python-six/python-six.hash
diff --git a/software/package/python-six/python-six.mk b/buildroot/package/python-six/python-six.mk
similarity index 100%
rename from software/package/python-six/python-six.mk
rename to buildroot/package/python-six/python-six.mk
diff --git a/software/package/python-slob/Config.in b/buildroot/package/python-slob/Config.in
similarity index 100%
rename from software/package/python-slob/Config.in
rename to buildroot/package/python-slob/Config.in
diff --git a/software/package/python-slob/python-slob.hash b/buildroot/package/python-slob/python-slob.hash
similarity index 100%
rename from software/package/python-slob/python-slob.hash
rename to buildroot/package/python-slob/python-slob.hash
diff --git a/software/package/python-slob/python-slob.mk b/buildroot/package/python-slob/python-slob.mk
similarity index 100%
rename from software/package/python-slob/python-slob.mk
rename to buildroot/package/python-slob/python-slob.mk
diff --git a/software/package/python-smbus-cffi/Config.in b/buildroot/package/python-smbus-cffi/Config.in
similarity index 100%
rename from software/package/python-smbus-cffi/Config.in
rename to buildroot/package/python-smbus-cffi/Config.in
diff --git a/software/package/python-smbus-cffi/python-smbus-cffi.hash b/buildroot/package/python-smbus-cffi/python-smbus-cffi.hash
similarity index 100%
rename from software/package/python-smbus-cffi/python-smbus-cffi.hash
rename to buildroot/package/python-smbus-cffi/python-smbus-cffi.hash
diff --git a/software/package/python-smbus-cffi/python-smbus-cffi.mk b/buildroot/package/python-smbus-cffi/python-smbus-cffi.mk
similarity index 100%
rename from software/package/python-smbus-cffi/python-smbus-cffi.mk
rename to buildroot/package/python-smbus-cffi/python-smbus-cffi.mk
diff --git a/software/package/python-smmap2/Config.in b/buildroot/package/python-smmap2/Config.in
similarity index 100%
rename from software/package/python-smmap2/Config.in
rename to buildroot/package/python-smmap2/Config.in
diff --git a/software/package/python-smmap2/python-smmap2.hash b/buildroot/package/python-smmap2/python-smmap2.hash
similarity index 100%
rename from software/package/python-smmap2/python-smmap2.hash
rename to buildroot/package/python-smmap2/python-smmap2.hash
diff --git a/software/package/python-smmap2/python-smmap2.mk b/buildroot/package/python-smmap2/python-smmap2.mk
similarity index 100%
rename from software/package/python-smmap2/python-smmap2.mk
rename to buildroot/package/python-smmap2/python-smmap2.mk
diff --git a/software/package/python-socketio/Config.in b/buildroot/package/python-socketio/Config.in
similarity index 100%
rename from software/package/python-socketio/Config.in
rename to buildroot/package/python-socketio/Config.in
diff --git a/software/package/python-socketio/python-socketio.hash b/buildroot/package/python-socketio/python-socketio.hash
similarity index 100%
rename from software/package/python-socketio/python-socketio.hash
rename to buildroot/package/python-socketio/python-socketio.hash
diff --git a/software/package/python-socketio/python-socketio.mk b/buildroot/package/python-socketio/python-socketio.mk
similarity index 100%
rename from software/package/python-socketio/python-socketio.mk
rename to buildroot/package/python-socketio/python-socketio.mk
diff --git a/software/package/python-sockjs/Config.in b/buildroot/package/python-sockjs/Config.in
similarity index 100%
rename from software/package/python-sockjs/Config.in
rename to buildroot/package/python-sockjs/Config.in
diff --git a/software/package/python-sockjs/python-sockjs.hash b/buildroot/package/python-sockjs/python-sockjs.hash
similarity index 100%
rename from software/package/python-sockjs/python-sockjs.hash
rename to buildroot/package/python-sockjs/python-sockjs.hash
diff --git a/software/package/python-sockjs/python-sockjs.mk b/buildroot/package/python-sockjs/python-sockjs.mk
similarity index 100%
rename from software/package/python-sockjs/python-sockjs.mk
rename to buildroot/package/python-sockjs/python-sockjs.mk
diff --git a/software/package/python-sortedcontainers/Config.in b/buildroot/package/python-sortedcontainers/Config.in
similarity index 100%
rename from software/package/python-sortedcontainers/Config.in
rename to buildroot/package/python-sortedcontainers/Config.in
diff --git a/software/package/python-sortedcontainers/python-sortedcontainers.hash b/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
similarity index 100%
rename from software/package/python-sortedcontainers/python-sortedcontainers.hash
rename to buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
diff --git a/software/package/python-sortedcontainers/python-sortedcontainers.mk b/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
similarity index 100%
rename from software/package/python-sortedcontainers/python-sortedcontainers.mk
rename to buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
diff --git a/software/package/python-soupsieve/Config.in b/buildroot/package/python-soupsieve/Config.in
similarity index 100%
rename from software/package/python-soupsieve/Config.in
rename to buildroot/package/python-soupsieve/Config.in
diff --git a/software/package/python-soupsieve/python-soupsieve.hash b/buildroot/package/python-soupsieve/python-soupsieve.hash
similarity index 100%
rename from software/package/python-soupsieve/python-soupsieve.hash
rename to buildroot/package/python-soupsieve/python-soupsieve.hash
diff --git a/software/package/python-soupsieve/python-soupsieve.mk b/buildroot/package/python-soupsieve/python-soupsieve.mk
similarity index 100%
rename from software/package/python-soupsieve/python-soupsieve.mk
rename to buildroot/package/python-soupsieve/python-soupsieve.mk
diff --git a/software/package/python-spidev/Config.in b/buildroot/package/python-spidev/Config.in
similarity index 100%
rename from software/package/python-spidev/Config.in
rename to buildroot/package/python-spidev/Config.in
diff --git a/software/package/python-spidev/python-spidev.hash b/buildroot/package/python-spidev/python-spidev.hash
similarity index 100%
rename from software/package/python-spidev/python-spidev.hash
rename to buildroot/package/python-spidev/python-spidev.hash
diff --git a/software/package/python-spidev/python-spidev.mk b/buildroot/package/python-spidev/python-spidev.mk
similarity index 100%
rename from software/package/python-spidev/python-spidev.mk
rename to buildroot/package/python-spidev/python-spidev.mk
diff --git a/software/package/python-sqlalchemy/Config.in b/buildroot/package/python-sqlalchemy/Config.in
similarity index 100%
rename from software/package/python-sqlalchemy/Config.in
rename to buildroot/package/python-sqlalchemy/Config.in
diff --git a/software/package/python-sqlalchemy/python-sqlalchemy.hash b/buildroot/package/python-sqlalchemy/python-sqlalchemy.hash
similarity index 100%
rename from software/package/python-sqlalchemy/python-sqlalchemy.hash
rename to buildroot/package/python-sqlalchemy/python-sqlalchemy.hash
diff --git a/software/package/python-sqlalchemy/python-sqlalchemy.mk b/buildroot/package/python-sqlalchemy/python-sqlalchemy.mk
similarity index 100%
rename from software/package/python-sqlalchemy/python-sqlalchemy.mk
rename to buildroot/package/python-sqlalchemy/python-sqlalchemy.mk
diff --git a/software/package/python-sqliteschema/Config.in b/buildroot/package/python-sqliteschema/Config.in
similarity index 100%
rename from software/package/python-sqliteschema/Config.in
rename to buildroot/package/python-sqliteschema/Config.in
diff --git a/software/package/python-sqliteschema/python-sqliteschema.hash b/buildroot/package/python-sqliteschema/python-sqliteschema.hash
similarity index 100%
rename from software/package/python-sqliteschema/python-sqliteschema.hash
rename to buildroot/package/python-sqliteschema/python-sqliteschema.hash
diff --git a/software/package/python-sqliteschema/python-sqliteschema.mk b/buildroot/package/python-sqliteschema/python-sqliteschema.mk
similarity index 100%
rename from software/package/python-sqliteschema/python-sqliteschema.mk
rename to buildroot/package/python-sqliteschema/python-sqliteschema.mk
diff --git a/software/package/python-sqlparse/Config.in b/buildroot/package/python-sqlparse/Config.in
similarity index 100%
rename from software/package/python-sqlparse/Config.in
rename to buildroot/package/python-sqlparse/Config.in
diff --git a/software/package/python-sqlparse/python-sqlparse.hash b/buildroot/package/python-sqlparse/python-sqlparse.hash
similarity index 100%
rename from software/package/python-sqlparse/python-sqlparse.hash
rename to buildroot/package/python-sqlparse/python-sqlparse.hash
diff --git a/software/package/python-sqlparse/python-sqlparse.mk b/buildroot/package/python-sqlparse/python-sqlparse.mk
similarity index 100%
rename from software/package/python-sqlparse/python-sqlparse.mk
rename to buildroot/package/python-sqlparse/python-sqlparse.mk
diff --git a/software/package/python-subprocess32/Config.in b/buildroot/package/python-subprocess32/Config.in
similarity index 100%
rename from software/package/python-subprocess32/Config.in
rename to buildroot/package/python-subprocess32/Config.in
diff --git a/software/package/python-subprocess32/python-subprocess32.hash b/buildroot/package/python-subprocess32/python-subprocess32.hash
similarity index 100%
rename from software/package/python-subprocess32/python-subprocess32.hash
rename to buildroot/package/python-subprocess32/python-subprocess32.hash
diff --git a/software/package/python-subprocess32/python-subprocess32.mk b/buildroot/package/python-subprocess32/python-subprocess32.mk
similarity index 100%
rename from software/package/python-subprocess32/python-subprocess32.mk
rename to buildroot/package/python-subprocess32/python-subprocess32.mk
diff --git a/software/package/python-systemd/Config.in b/buildroot/package/python-systemd/Config.in
similarity index 100%
rename from software/package/python-systemd/Config.in
rename to buildroot/package/python-systemd/Config.in
diff --git a/software/package/python-systemd/python-systemd.hash b/buildroot/package/python-systemd/python-systemd.hash
similarity index 100%
rename from software/package/python-systemd/python-systemd.hash
rename to buildroot/package/python-systemd/python-systemd.hash
diff --git a/software/package/python-systemd/python-systemd.mk b/buildroot/package/python-systemd/python-systemd.mk
similarity index 100%
rename from software/package/python-systemd/python-systemd.mk
rename to buildroot/package/python-systemd/python-systemd.mk
diff --git a/software/package/python-tabledata/Config.in b/buildroot/package/python-tabledata/Config.in
similarity index 100%
rename from software/package/python-tabledata/Config.in
rename to buildroot/package/python-tabledata/Config.in
diff --git a/software/package/python-tabledata/python-tabledata.hash b/buildroot/package/python-tabledata/python-tabledata.hash
similarity index 100%
rename from software/package/python-tabledata/python-tabledata.hash
rename to buildroot/package/python-tabledata/python-tabledata.hash
diff --git a/software/package/python-tabledata/python-tabledata.mk b/buildroot/package/python-tabledata/python-tabledata.mk
similarity index 100%
rename from software/package/python-tabledata/python-tabledata.mk
rename to buildroot/package/python-tabledata/python-tabledata.mk
diff --git a/software/package/python-tempora/Config.in b/buildroot/package/python-tempora/Config.in
similarity index 100%
rename from software/package/python-tempora/Config.in
rename to buildroot/package/python-tempora/Config.in
diff --git a/software/package/python-tempora/python-tempora.hash b/buildroot/package/python-tempora/python-tempora.hash
similarity index 100%
rename from software/package/python-tempora/python-tempora.hash
rename to buildroot/package/python-tempora/python-tempora.hash
diff --git a/software/package/python-tempora/python-tempora.mk b/buildroot/package/python-tempora/python-tempora.mk
similarity index 100%
rename from software/package/python-tempora/python-tempora.mk
rename to buildroot/package/python-tempora/python-tempora.mk
diff --git a/software/package/python-termcolor/Config.in b/buildroot/package/python-termcolor/Config.in
similarity index 100%
rename from software/package/python-termcolor/Config.in
rename to buildroot/package/python-termcolor/Config.in
diff --git a/software/package/python-termcolor/python-termcolor.hash b/buildroot/package/python-termcolor/python-termcolor.hash
similarity index 100%
rename from software/package/python-termcolor/python-termcolor.hash
rename to buildroot/package/python-termcolor/python-termcolor.hash
diff --git a/software/package/python-termcolor/python-termcolor.mk b/buildroot/package/python-termcolor/python-termcolor.mk
similarity index 100%
rename from software/package/python-termcolor/python-termcolor.mk
rename to buildroot/package/python-termcolor/python-termcolor.mk
diff --git a/software/package/python-terminaltables/Config.in b/buildroot/package/python-terminaltables/Config.in
similarity index 100%
rename from software/package/python-terminaltables/Config.in
rename to buildroot/package/python-terminaltables/Config.in
diff --git a/software/package/python-terminaltables/python-terminaltables.hash b/buildroot/package/python-terminaltables/python-terminaltables.hash
similarity index 100%
rename from software/package/python-terminaltables/python-terminaltables.hash
rename to buildroot/package/python-terminaltables/python-terminaltables.hash
diff --git a/software/package/python-terminaltables/python-terminaltables.mk b/buildroot/package/python-terminaltables/python-terminaltables.mk
similarity index 100%
rename from software/package/python-terminaltables/python-terminaltables.mk
rename to buildroot/package/python-terminaltables/python-terminaltables.mk
diff --git a/software/package/python-texttable/Config.in b/buildroot/package/python-texttable/Config.in
similarity index 100%
rename from software/package/python-texttable/Config.in
rename to buildroot/package/python-texttable/Config.in
diff --git a/software/package/python-texttable/python-texttable.hash b/buildroot/package/python-texttable/python-texttable.hash
similarity index 100%
rename from software/package/python-texttable/python-texttable.hash
rename to buildroot/package/python-texttable/python-texttable.hash
diff --git a/software/package/python-texttable/python-texttable.mk b/buildroot/package/python-texttable/python-texttable.mk
similarity index 100%
rename from software/package/python-texttable/python-texttable.mk
rename to buildroot/package/python-texttable/python-texttable.mk
diff --git a/software/package/python-thrift/Config.in b/buildroot/package/python-thrift/Config.in
similarity index 100%
rename from software/package/python-thrift/Config.in
rename to buildroot/package/python-thrift/Config.in
diff --git a/software/package/python-thrift/python-thrift.hash b/buildroot/package/python-thrift/python-thrift.hash
similarity index 100%
rename from software/package/python-thrift/python-thrift.hash
rename to buildroot/package/python-thrift/python-thrift.hash
diff --git a/software/package/python-thrift/python-thrift.mk b/buildroot/package/python-thrift/python-thrift.mk
similarity index 100%
rename from software/package/python-thrift/python-thrift.mk
rename to buildroot/package/python-thrift/python-thrift.mk
diff --git a/software/package/python-tinyrpc/Config.in b/buildroot/package/python-tinyrpc/Config.in
similarity index 100%
rename from software/package/python-tinyrpc/Config.in
rename to buildroot/package/python-tinyrpc/Config.in
diff --git a/software/package/python-tinyrpc/python-tinyrpc.hash b/buildroot/package/python-tinyrpc/python-tinyrpc.hash
similarity index 100%
rename from software/package/python-tinyrpc/python-tinyrpc.hash
rename to buildroot/package/python-tinyrpc/python-tinyrpc.hash
diff --git a/software/package/python-tinyrpc/python-tinyrpc.mk b/buildroot/package/python-tinyrpc/python-tinyrpc.mk
similarity index 100%
rename from software/package/python-tinyrpc/python-tinyrpc.mk
rename to buildroot/package/python-tinyrpc/python-tinyrpc.mk
diff --git a/software/package/python-tomako/Config.in b/buildroot/package/python-tomako/Config.in
similarity index 100%
rename from software/package/python-tomako/Config.in
rename to buildroot/package/python-tomako/Config.in
diff --git a/software/package/python-tomako/python-tomako.hash b/buildroot/package/python-tomako/python-tomako.hash
similarity index 100%
rename from software/package/python-tomako/python-tomako.hash
rename to buildroot/package/python-tomako/python-tomako.hash
diff --git a/software/package/python-tomako/python-tomako.mk b/buildroot/package/python-tomako/python-tomako.mk
similarity index 100%
rename from software/package/python-tomako/python-tomako.mk
rename to buildroot/package/python-tomako/python-tomako.mk
diff --git a/software/package/python-toml/Config.in b/buildroot/package/python-toml/Config.in
similarity index 100%
rename from software/package/python-toml/Config.in
rename to buildroot/package/python-toml/Config.in
diff --git a/software/package/python-toml/python-toml.hash b/buildroot/package/python-toml/python-toml.hash
similarity index 100%
rename from software/package/python-toml/python-toml.hash
rename to buildroot/package/python-toml/python-toml.hash
diff --git a/software/package/python-toml/python-toml.mk b/buildroot/package/python-toml/python-toml.mk
similarity index 100%
rename from software/package/python-toml/python-toml.mk
rename to buildroot/package/python-toml/python-toml.mk
diff --git a/software/package/python-tornado/Config.in b/buildroot/package/python-tornado/Config.in
similarity index 100%
rename from software/package/python-tornado/Config.in
rename to buildroot/package/python-tornado/Config.in
diff --git a/software/package/python-tornado/python-tornado.hash b/buildroot/package/python-tornado/python-tornado.hash
similarity index 100%
rename from software/package/python-tornado/python-tornado.hash
rename to buildroot/package/python-tornado/python-tornado.hash
diff --git a/software/package/python-tornado/python-tornado.mk b/buildroot/package/python-tornado/python-tornado.mk
similarity index 100%
rename from software/package/python-tornado/python-tornado.mk
rename to buildroot/package/python-tornado/python-tornado.mk
diff --git a/software/package/python-tqdm/Config.in b/buildroot/package/python-tqdm/Config.in
similarity index 100%
rename from software/package/python-tqdm/Config.in
rename to buildroot/package/python-tqdm/Config.in
diff --git a/software/package/python-tqdm/python-tqdm.hash b/buildroot/package/python-tqdm/python-tqdm.hash
similarity index 100%
rename from software/package/python-tqdm/python-tqdm.hash
rename to buildroot/package/python-tqdm/python-tqdm.hash
diff --git a/software/package/python-tqdm/python-tqdm.mk b/buildroot/package/python-tqdm/python-tqdm.mk
similarity index 100%
rename from software/package/python-tqdm/python-tqdm.mk
rename to buildroot/package/python-tqdm/python-tqdm.mk
diff --git a/software/package/python-traitlets/Config.in b/buildroot/package/python-traitlets/Config.in
similarity index 100%
rename from software/package/python-traitlets/Config.in
rename to buildroot/package/python-traitlets/Config.in
diff --git a/software/package/python-traitlets/python-traitlets.hash b/buildroot/package/python-traitlets/python-traitlets.hash
similarity index 100%
rename from software/package/python-traitlets/python-traitlets.hash
rename to buildroot/package/python-traitlets/python-traitlets.hash
diff --git a/software/package/python-traitlets/python-traitlets.mk b/buildroot/package/python-traitlets/python-traitlets.mk
similarity index 100%
rename from software/package/python-traitlets/python-traitlets.mk
rename to buildroot/package/python-traitlets/python-traitlets.mk
diff --git a/software/package/python-treq/Config.in b/buildroot/package/python-treq/Config.in
similarity index 100%
rename from software/package/python-treq/Config.in
rename to buildroot/package/python-treq/Config.in
diff --git a/software/package/python-treq/python-treq.hash b/buildroot/package/python-treq/python-treq.hash
similarity index 100%
rename from software/package/python-treq/python-treq.hash
rename to buildroot/package/python-treq/python-treq.hash
diff --git a/software/package/python-treq/python-treq.mk b/buildroot/package/python-treq/python-treq.mk
similarity index 100%
rename from software/package/python-treq/python-treq.mk
rename to buildroot/package/python-treq/python-treq.mk
diff --git a/software/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch b/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch
similarity index 100%
rename from software/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch
rename to buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch
diff --git a/software/package/python-twisted/Config.in b/buildroot/package/python-twisted/Config.in
similarity index 100%
rename from software/package/python-twisted/Config.in
rename to buildroot/package/python-twisted/Config.in
diff --git a/software/package/python-twisted/python-twisted.hash b/buildroot/package/python-twisted/python-twisted.hash
similarity index 100%
rename from software/package/python-twisted/python-twisted.hash
rename to buildroot/package/python-twisted/python-twisted.hash
diff --git a/software/package/python-twisted/python-twisted.mk b/buildroot/package/python-twisted/python-twisted.mk
similarity index 100%
rename from software/package/python-twisted/python-twisted.mk
rename to buildroot/package/python-twisted/python-twisted.mk
diff --git a/software/package/python-txaio/Config.in b/buildroot/package/python-txaio/Config.in
similarity index 100%
rename from software/package/python-txaio/Config.in
rename to buildroot/package/python-txaio/Config.in
diff --git a/software/package/python-txaio/python-txaio.hash b/buildroot/package/python-txaio/python-txaio.hash
similarity index 100%
rename from software/package/python-txaio/python-txaio.hash
rename to buildroot/package/python-txaio/python-txaio.hash
diff --git a/software/package/python-txaio/python-txaio.mk b/buildroot/package/python-txaio/python-txaio.mk
similarity index 100%
rename from software/package/python-txaio/python-txaio.mk
rename to buildroot/package/python-txaio/python-txaio.mk
diff --git a/software/package/python-txdbus/Config.in b/buildroot/package/python-txdbus/Config.in
similarity index 100%
rename from software/package/python-txdbus/Config.in
rename to buildroot/package/python-txdbus/Config.in
diff --git a/software/package/python-txdbus/python-txdbus.hash b/buildroot/package/python-txdbus/python-txdbus.hash
similarity index 100%
rename from software/package/python-txdbus/python-txdbus.hash
rename to buildroot/package/python-txdbus/python-txdbus.hash
diff --git a/software/package/python-txdbus/python-txdbus.mk b/buildroot/package/python-txdbus/python-txdbus.mk
similarity index 100%
rename from software/package/python-txdbus/python-txdbus.mk
rename to buildroot/package/python-txdbus/python-txdbus.mk
diff --git a/software/package/python-txtorcon/Config.in b/buildroot/package/python-txtorcon/Config.in
similarity index 100%
rename from software/package/python-txtorcon/Config.in
rename to buildroot/package/python-txtorcon/Config.in
diff --git a/software/package/python-txtorcon/python-txtorcon.hash b/buildroot/package/python-txtorcon/python-txtorcon.hash
similarity index 100%
rename from software/package/python-txtorcon/python-txtorcon.hash
rename to buildroot/package/python-txtorcon/python-txtorcon.hash
diff --git a/software/package/python-txtorcon/python-txtorcon.mk b/buildroot/package/python-txtorcon/python-txtorcon.mk
similarity index 100%
rename from software/package/python-txtorcon/python-txtorcon.mk
rename to buildroot/package/python-txtorcon/python-txtorcon.mk
diff --git a/software/package/python-typepy/Config.in b/buildroot/package/python-typepy/Config.in
similarity index 100%
rename from software/package/python-typepy/Config.in
rename to buildroot/package/python-typepy/Config.in
diff --git a/software/package/python-typepy/python-typepy.hash b/buildroot/package/python-typepy/python-typepy.hash
similarity index 100%
rename from software/package/python-typepy/python-typepy.hash
rename to buildroot/package/python-typepy/python-typepy.hash
diff --git a/software/package/python-typepy/python-typepy.mk b/buildroot/package/python-typepy/python-typepy.mk
similarity index 100%
rename from software/package/python-typepy/python-typepy.mk
rename to buildroot/package/python-typepy/python-typepy.mk
diff --git a/software/package/python-typing/Config.in b/buildroot/package/python-typing/Config.in
similarity index 100%
rename from software/package/python-typing/Config.in
rename to buildroot/package/python-typing/Config.in
diff --git a/software/package/python-typing/python-typing.hash b/buildroot/package/python-typing/python-typing.hash
similarity index 100%
rename from software/package/python-typing/python-typing.hash
rename to buildroot/package/python-typing/python-typing.hash
diff --git a/software/package/python-typing/python-typing.mk b/buildroot/package/python-typing/python-typing.mk
similarity index 100%
rename from software/package/python-typing/python-typing.mk
rename to buildroot/package/python-typing/python-typing.mk
diff --git a/software/package/python-u-msgpack/Config.in b/buildroot/package/python-u-msgpack/Config.in
similarity index 100%
rename from software/package/python-u-msgpack/Config.in
rename to buildroot/package/python-u-msgpack/Config.in
diff --git a/software/package/python-u-msgpack/python-u-msgpack.hash b/buildroot/package/python-u-msgpack/python-u-msgpack.hash
similarity index 100%
rename from software/package/python-u-msgpack/python-u-msgpack.hash
rename to buildroot/package/python-u-msgpack/python-u-msgpack.hash
diff --git a/software/package/python-u-msgpack/python-u-msgpack.mk b/buildroot/package/python-u-msgpack/python-u-msgpack.mk
similarity index 100%
rename from software/package/python-u-msgpack/python-u-msgpack.mk
rename to buildroot/package/python-u-msgpack/python-u-msgpack.mk
diff --git a/software/package/python-ubjson/Config.in b/buildroot/package/python-ubjson/Config.in
similarity index 100%
rename from software/package/python-ubjson/Config.in
rename to buildroot/package/python-ubjson/Config.in
diff --git a/software/package/python-ubjson/python-ubjson.hash b/buildroot/package/python-ubjson/python-ubjson.hash
similarity index 100%
rename from software/package/python-ubjson/python-ubjson.hash
rename to buildroot/package/python-ubjson/python-ubjson.hash
diff --git a/software/package/python-ubjson/python-ubjson.mk b/buildroot/package/python-ubjson/python-ubjson.mk
similarity index 100%
rename from software/package/python-ubjson/python-ubjson.mk
rename to buildroot/package/python-ubjson/python-ubjson.mk
diff --git a/software/package/python-ujson/Config.in b/buildroot/package/python-ujson/Config.in
similarity index 100%
rename from software/package/python-ujson/Config.in
rename to buildroot/package/python-ujson/Config.in
diff --git a/software/package/python-ujson/python-ujson.hash b/buildroot/package/python-ujson/python-ujson.hash
similarity index 100%
rename from software/package/python-ujson/python-ujson.hash
rename to buildroot/package/python-ujson/python-ujson.hash
diff --git a/software/package/python-ujson/python-ujson.mk b/buildroot/package/python-ujson/python-ujson.mk
similarity index 100%
rename from software/package/python-ujson/python-ujson.mk
rename to buildroot/package/python-ujson/python-ujson.mk
diff --git a/software/package/python-urllib3/Config.in b/buildroot/package/python-urllib3/Config.in
similarity index 100%
rename from software/package/python-urllib3/Config.in
rename to buildroot/package/python-urllib3/Config.in
diff --git a/software/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash
similarity index 100%
rename from software/package/python-urllib3/python-urllib3.hash
rename to buildroot/package/python-urllib3/python-urllib3.hash
diff --git a/software/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk
similarity index 100%
rename from software/package/python-urllib3/python-urllib3.mk
rename to buildroot/package/python-urllib3/python-urllib3.mk
diff --git a/software/package/python-urwid/Config.in b/buildroot/package/python-urwid/Config.in
similarity index 100%
rename from software/package/python-urwid/Config.in
rename to buildroot/package/python-urwid/Config.in
diff --git a/software/package/python-urwid/python-urwid.hash b/buildroot/package/python-urwid/python-urwid.hash
similarity index 100%
rename from software/package/python-urwid/python-urwid.hash
rename to buildroot/package/python-urwid/python-urwid.hash
diff --git a/software/package/python-urwid/python-urwid.mk b/buildroot/package/python-urwid/python-urwid.mk
similarity index 100%
rename from software/package/python-urwid/python-urwid.mk
rename to buildroot/package/python-urwid/python-urwid.mk
diff --git a/software/package/python-uvloop/Config.in b/buildroot/package/python-uvloop/Config.in
similarity index 100%
rename from software/package/python-uvloop/Config.in
rename to buildroot/package/python-uvloop/Config.in
diff --git a/software/package/python-uvloop/python-uvloop.hash b/buildroot/package/python-uvloop/python-uvloop.hash
similarity index 100%
rename from software/package/python-uvloop/python-uvloop.hash
rename to buildroot/package/python-uvloop/python-uvloop.hash
diff --git a/software/package/python-uvloop/python-uvloop.mk b/buildroot/package/python-uvloop/python-uvloop.mk
similarity index 100%
rename from software/package/python-uvloop/python-uvloop.mk
rename to buildroot/package/python-uvloop/python-uvloop.mk
diff --git a/software/package/python-validators/Config.in b/buildroot/package/python-validators/Config.in
similarity index 100%
rename from software/package/python-validators/Config.in
rename to buildroot/package/python-validators/Config.in
diff --git a/software/package/python-validators/python-validators.hash b/buildroot/package/python-validators/python-validators.hash
similarity index 100%
rename from software/package/python-validators/python-validators.hash
rename to buildroot/package/python-validators/python-validators.hash
diff --git a/software/package/python-validators/python-validators.mk b/buildroot/package/python-validators/python-validators.mk
similarity index 100%
rename from software/package/python-validators/python-validators.mk
rename to buildroot/package/python-validators/python-validators.mk
diff --git a/software/package/python-vcversioner/python-vcversioner.hash b/buildroot/package/python-vcversioner/python-vcversioner.hash
similarity index 100%
rename from software/package/python-vcversioner/python-vcversioner.hash
rename to buildroot/package/python-vcversioner/python-vcversioner.hash
diff --git a/software/package/python-vcversioner/python-vcversioner.mk b/buildroot/package/python-vcversioner/python-vcversioner.mk
similarity index 100%
rename from software/package/python-vcversioner/python-vcversioner.mk
rename to buildroot/package/python-vcversioner/python-vcversioner.mk
diff --git a/software/package/python-versiontools/Config.in b/buildroot/package/python-versiontools/Config.in
similarity index 100%
rename from software/package/python-versiontools/Config.in
rename to buildroot/package/python-versiontools/Config.in
diff --git a/software/package/python-versiontools/python-versiontools.hash b/buildroot/package/python-versiontools/python-versiontools.hash
similarity index 100%
rename from software/package/python-versiontools/python-versiontools.hash
rename to buildroot/package/python-versiontools/python-versiontools.hash
diff --git a/software/package/python-versiontools/python-versiontools.mk b/buildroot/package/python-versiontools/python-versiontools.mk
similarity index 100%
rename from software/package/python-versiontools/python-versiontools.mk
rename to buildroot/package/python-versiontools/python-versiontools.mk
diff --git a/software/package/python-visitor/Config.in b/buildroot/package/python-visitor/Config.in
similarity index 100%
rename from software/package/python-visitor/Config.in
rename to buildroot/package/python-visitor/Config.in
diff --git a/software/package/python-visitor/python-visitor.hash b/buildroot/package/python-visitor/python-visitor.hash
similarity index 100%
rename from software/package/python-visitor/python-visitor.hash
rename to buildroot/package/python-visitor/python-visitor.hash
diff --git a/software/package/python-visitor/python-visitor.mk b/buildroot/package/python-visitor/python-visitor.mk
similarity index 100%
rename from software/package/python-visitor/python-visitor.mk
rename to buildroot/package/python-visitor/python-visitor.mk
diff --git a/software/package/python-watchdog/Config.in b/buildroot/package/python-watchdog/Config.in
similarity index 100%
rename from software/package/python-watchdog/Config.in
rename to buildroot/package/python-watchdog/Config.in
diff --git a/software/package/python-watchdog/python-watchdog.hash b/buildroot/package/python-watchdog/python-watchdog.hash
similarity index 100%
rename from software/package/python-watchdog/python-watchdog.hash
rename to buildroot/package/python-watchdog/python-watchdog.hash
diff --git a/software/package/python-watchdog/python-watchdog.mk b/buildroot/package/python-watchdog/python-watchdog.mk
similarity index 100%
rename from software/package/python-watchdog/python-watchdog.mk
rename to buildroot/package/python-watchdog/python-watchdog.mk
diff --git a/software/package/python-wcwidth/Config.in b/buildroot/package/python-wcwidth/Config.in
similarity index 100%
rename from software/package/python-wcwidth/Config.in
rename to buildroot/package/python-wcwidth/Config.in
diff --git a/software/package/python-wcwidth/python-wcwidth.hash b/buildroot/package/python-wcwidth/python-wcwidth.hash
similarity index 100%
rename from software/package/python-wcwidth/python-wcwidth.hash
rename to buildroot/package/python-wcwidth/python-wcwidth.hash
diff --git a/software/package/python-wcwidth/python-wcwidth.mk b/buildroot/package/python-wcwidth/python-wcwidth.mk
similarity index 100%
rename from software/package/python-wcwidth/python-wcwidth.mk
rename to buildroot/package/python-wcwidth/python-wcwidth.mk
diff --git a/software/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch b/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch
similarity index 100%
rename from software/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch
rename to buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch
diff --git a/software/package/python-web2py/Config.in b/buildroot/package/python-web2py/Config.in
similarity index 100%
rename from software/package/python-web2py/Config.in
rename to buildroot/package/python-web2py/Config.in
diff --git a/software/package/python-web2py/S51web2py b/buildroot/package/python-web2py/S51web2py
similarity index 100%
rename from software/package/python-web2py/S51web2py
rename to buildroot/package/python-web2py/S51web2py
diff --git a/software/package/python-web2py/python-web2py.hash b/buildroot/package/python-web2py/python-web2py.hash
similarity index 100%
rename from software/package/python-web2py/python-web2py.hash
rename to buildroot/package/python-web2py/python-web2py.hash
diff --git a/software/package/python-web2py/python-web2py.mk b/buildroot/package/python-web2py/python-web2py.mk
similarity index 100%
rename from software/package/python-web2py/python-web2py.mk
rename to buildroot/package/python-web2py/python-web2py.mk
diff --git a/software/package/python-web2py/web2py.service b/buildroot/package/python-web2py/web2py.service
similarity index 100%
rename from software/package/python-web2py/web2py.service
rename to buildroot/package/python-web2py/web2py.service
diff --git a/software/package/python-webencodings/Config.in b/buildroot/package/python-webencodings/Config.in
similarity index 100%
rename from software/package/python-webencodings/Config.in
rename to buildroot/package/python-webencodings/Config.in
diff --git a/software/package/python-webencodings/python-webencodings.hash b/buildroot/package/python-webencodings/python-webencodings.hash
similarity index 100%
rename from software/package/python-webencodings/python-webencodings.hash
rename to buildroot/package/python-webencodings/python-webencodings.hash
diff --git a/software/package/python-webencodings/python-webencodings.mk b/buildroot/package/python-webencodings/python-webencodings.mk
similarity index 100%
rename from software/package/python-webencodings/python-webencodings.mk
rename to buildroot/package/python-webencodings/python-webencodings.mk
diff --git a/software/package/python-webob/Config.in b/buildroot/package/python-webob/Config.in
similarity index 100%
rename from software/package/python-webob/Config.in
rename to buildroot/package/python-webob/Config.in
diff --git a/software/package/python-webob/python-webob.hash b/buildroot/package/python-webob/python-webob.hash
similarity index 100%
rename from software/package/python-webob/python-webob.hash
rename to buildroot/package/python-webob/python-webob.hash
diff --git a/software/package/python-webob/python-webob.mk b/buildroot/package/python-webob/python-webob.mk
similarity index 100%
rename from software/package/python-webob/python-webob.mk
rename to buildroot/package/python-webob/python-webob.mk
diff --git a/software/package/python-webpy/Config.in b/buildroot/package/python-webpy/Config.in
similarity index 100%
rename from software/package/python-webpy/Config.in
rename to buildroot/package/python-webpy/Config.in
diff --git a/software/package/python-webpy/python-webpy.hash b/buildroot/package/python-webpy/python-webpy.hash
similarity index 100%
rename from software/package/python-webpy/python-webpy.hash
rename to buildroot/package/python-webpy/python-webpy.hash
diff --git a/software/package/python-webpy/python-webpy.mk b/buildroot/package/python-webpy/python-webpy.mk
similarity index 100%
rename from software/package/python-webpy/python-webpy.mk
rename to buildroot/package/python-webpy/python-webpy.mk
diff --git a/software/package/python-websocket-client/Config.in b/buildroot/package/python-websocket-client/Config.in
similarity index 100%
rename from software/package/python-websocket-client/Config.in
rename to buildroot/package/python-websocket-client/Config.in
diff --git a/software/package/python-websocket-client/python-websocket-client.hash b/buildroot/package/python-websocket-client/python-websocket-client.hash
similarity index 100%
rename from software/package/python-websocket-client/python-websocket-client.hash
rename to buildroot/package/python-websocket-client/python-websocket-client.hash
diff --git a/software/package/python-websocket-client/python-websocket-client.mk b/buildroot/package/python-websocket-client/python-websocket-client.mk
similarity index 100%
rename from software/package/python-websocket-client/python-websocket-client.mk
rename to buildroot/package/python-websocket-client/python-websocket-client.mk
diff --git a/software/package/python-websockets/Config.in b/buildroot/package/python-websockets/Config.in
similarity index 100%
rename from software/package/python-websockets/Config.in
rename to buildroot/package/python-websockets/Config.in
diff --git a/software/package/python-websockets/python-websockets.hash b/buildroot/package/python-websockets/python-websockets.hash
similarity index 100%
rename from software/package/python-websockets/python-websockets.hash
rename to buildroot/package/python-websockets/python-websockets.hash
diff --git a/software/package/python-websockets/python-websockets.mk b/buildroot/package/python-websockets/python-websockets.mk
similarity index 100%
rename from software/package/python-websockets/python-websockets.mk
rename to buildroot/package/python-websockets/python-websockets.mk
diff --git a/software/package/python-werkzeug/Config.in b/buildroot/package/python-werkzeug/Config.in
similarity index 100%
rename from software/package/python-werkzeug/Config.in
rename to buildroot/package/python-werkzeug/Config.in
diff --git a/software/package/python-werkzeug/python-werkzeug.hash b/buildroot/package/python-werkzeug/python-werkzeug.hash
similarity index 100%
rename from software/package/python-werkzeug/python-werkzeug.hash
rename to buildroot/package/python-werkzeug/python-werkzeug.hash
diff --git a/software/package/python-werkzeug/python-werkzeug.mk b/buildroot/package/python-werkzeug/python-werkzeug.mk
similarity index 100%
rename from software/package/python-werkzeug/python-werkzeug.mk
rename to buildroot/package/python-werkzeug/python-werkzeug.mk
diff --git a/software/package/python-whoosh/Config.in b/buildroot/package/python-whoosh/Config.in
similarity index 100%
rename from software/package/python-whoosh/Config.in
rename to buildroot/package/python-whoosh/Config.in
diff --git a/software/package/python-whoosh/python-whoosh.hash b/buildroot/package/python-whoosh/python-whoosh.hash
similarity index 100%
rename from software/package/python-whoosh/python-whoosh.hash
rename to buildroot/package/python-whoosh/python-whoosh.hash
diff --git a/software/package/python-whoosh/python-whoosh.mk b/buildroot/package/python-whoosh/python-whoosh.mk
similarity index 100%
rename from software/package/python-whoosh/python-whoosh.mk
rename to buildroot/package/python-whoosh/python-whoosh.mk
diff --git a/software/package/python-wrapt/Config.in b/buildroot/package/python-wrapt/Config.in
similarity index 100%
rename from software/package/python-wrapt/Config.in
rename to buildroot/package/python-wrapt/Config.in
diff --git a/software/package/python-wrapt/python-wrapt.hash b/buildroot/package/python-wrapt/python-wrapt.hash
similarity index 100%
rename from software/package/python-wrapt/python-wrapt.hash
rename to buildroot/package/python-wrapt/python-wrapt.hash
diff --git a/software/package/python-wrapt/python-wrapt.mk b/buildroot/package/python-wrapt/python-wrapt.mk
similarity index 100%
rename from software/package/python-wrapt/python-wrapt.mk
rename to buildroot/package/python-wrapt/python-wrapt.mk
diff --git a/software/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch b/buildroot/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch
similarity index 100%
rename from software/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch
rename to buildroot/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch
diff --git a/software/package/python-ws4py/Config.in b/buildroot/package/python-ws4py/Config.in
similarity index 100%
rename from software/package/python-ws4py/Config.in
rename to buildroot/package/python-ws4py/Config.in
diff --git a/software/package/python-ws4py/python-ws4py.hash b/buildroot/package/python-ws4py/python-ws4py.hash
similarity index 100%
rename from software/package/python-ws4py/python-ws4py.hash
rename to buildroot/package/python-ws4py/python-ws4py.hash
diff --git a/software/package/python-ws4py/python-ws4py.mk b/buildroot/package/python-ws4py/python-ws4py.mk
similarity index 100%
rename from software/package/python-ws4py/python-ws4py.mk
rename to buildroot/package/python-ws4py/python-ws4py.mk
diff --git a/software/package/python-wsaccel/Config.in b/buildroot/package/python-wsaccel/Config.in
similarity index 100%
rename from software/package/python-wsaccel/Config.in
rename to buildroot/package/python-wsaccel/Config.in
diff --git a/software/package/python-wsaccel/python-wsaccel.hash b/buildroot/package/python-wsaccel/python-wsaccel.hash
similarity index 100%
rename from software/package/python-wsaccel/python-wsaccel.hash
rename to buildroot/package/python-wsaccel/python-wsaccel.hash
diff --git a/software/package/python-wsaccel/python-wsaccel.mk b/buildroot/package/python-wsaccel/python-wsaccel.mk
similarity index 100%
rename from software/package/python-wsaccel/python-wsaccel.mk
rename to buildroot/package/python-wsaccel/python-wsaccel.mk
diff --git a/software/package/python-wtforms/Config.in b/buildroot/package/python-wtforms/Config.in
similarity index 100%
rename from software/package/python-wtforms/Config.in
rename to buildroot/package/python-wtforms/Config.in
diff --git a/software/package/python-wtforms/python-wtforms.hash b/buildroot/package/python-wtforms/python-wtforms.hash
similarity index 100%
rename from software/package/python-wtforms/python-wtforms.hash
rename to buildroot/package/python-wtforms/python-wtforms.hash
diff --git a/software/package/python-wtforms/python-wtforms.mk b/buildroot/package/python-wtforms/python-wtforms.mk
similarity index 100%
rename from software/package/python-wtforms/python-wtforms.mk
rename to buildroot/package/python-wtforms/python-wtforms.mk
diff --git a/software/package/python-xlib/Config.in b/buildroot/package/python-xlib/Config.in
similarity index 100%
rename from software/package/python-xlib/Config.in
rename to buildroot/package/python-xlib/Config.in
diff --git a/software/package/python-xlib/python-xlib.hash b/buildroot/package/python-xlib/python-xlib.hash
similarity index 100%
rename from software/package/python-xlib/python-xlib.hash
rename to buildroot/package/python-xlib/python-xlib.hash
diff --git a/software/package/python-xlib/python-xlib.mk b/buildroot/package/python-xlib/python-xlib.mk
similarity index 100%
rename from software/package/python-xlib/python-xlib.mk
rename to buildroot/package/python-xlib/python-xlib.mk
diff --git a/software/package/python-xlrd/Config.in b/buildroot/package/python-xlrd/Config.in
similarity index 100%
rename from software/package/python-xlrd/Config.in
rename to buildroot/package/python-xlrd/Config.in
diff --git a/software/package/python-xlrd/Config.in.host b/buildroot/package/python-xlrd/Config.in.host
similarity index 100%
rename from software/package/python-xlrd/Config.in.host
rename to buildroot/package/python-xlrd/Config.in.host
diff --git a/software/package/python-xlrd/python-xlrd.hash b/buildroot/package/python-xlrd/python-xlrd.hash
similarity index 100%
rename from software/package/python-xlrd/python-xlrd.hash
rename to buildroot/package/python-xlrd/python-xlrd.hash
diff --git a/software/package/python-xlrd/python-xlrd.mk b/buildroot/package/python-xlrd/python-xlrd.mk
similarity index 100%
rename from software/package/python-xlrd/python-xlrd.mk
rename to buildroot/package/python-xlrd/python-xlrd.mk
diff --git a/software/package/python-xlsxwriter/Config.in b/buildroot/package/python-xlsxwriter/Config.in
similarity index 100%
rename from software/package/python-xlsxwriter/Config.in
rename to buildroot/package/python-xlsxwriter/Config.in
diff --git a/software/package/python-xlsxwriter/python-xlsxwriter.hash b/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash
similarity index 100%
rename from software/package/python-xlsxwriter/python-xlsxwriter.hash
rename to buildroot/package/python-xlsxwriter/python-xlsxwriter.hash
diff --git a/software/package/python-xlsxwriter/python-xlsxwriter.mk b/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk
similarity index 100%
rename from software/package/python-xlsxwriter/python-xlsxwriter.mk
rename to buildroot/package/python-xlsxwriter/python-xlsxwriter.mk
diff --git a/software/package/python-xlutils/Config.in b/buildroot/package/python-xlutils/Config.in
similarity index 100%
rename from software/package/python-xlutils/Config.in
rename to buildroot/package/python-xlutils/Config.in
diff --git a/software/package/python-xlutils/python-xlutils.hash b/buildroot/package/python-xlutils/python-xlutils.hash
similarity index 100%
rename from software/package/python-xlutils/python-xlutils.hash
rename to buildroot/package/python-xlutils/python-xlutils.hash
diff --git a/software/package/python-xlutils/python-xlutils.mk b/buildroot/package/python-xlutils/python-xlutils.mk
similarity index 100%
rename from software/package/python-xlutils/python-xlutils.mk
rename to buildroot/package/python-xlutils/python-xlutils.mk
diff --git a/software/package/python-xlwt/Config.in b/buildroot/package/python-xlwt/Config.in
similarity index 100%
rename from software/package/python-xlwt/Config.in
rename to buildroot/package/python-xlwt/Config.in
diff --git a/software/package/python-xlwt/python-xlwt.hash b/buildroot/package/python-xlwt/python-xlwt.hash
similarity index 100%
rename from software/package/python-xlwt/python-xlwt.hash
rename to buildroot/package/python-xlwt/python-xlwt.hash
diff --git a/software/package/python-xlwt/python-xlwt.mk b/buildroot/package/python-xlwt/python-xlwt.mk
similarity index 100%
rename from software/package/python-xlwt/python-xlwt.mk
rename to buildroot/package/python-xlwt/python-xlwt.mk
diff --git a/software/package/python-xmltodict/Config.in b/buildroot/package/python-xmltodict/Config.in
similarity index 100%
rename from software/package/python-xmltodict/Config.in
rename to buildroot/package/python-xmltodict/Config.in
diff --git a/software/package/python-xmltodict/python-xmltodict.hash b/buildroot/package/python-xmltodict/python-xmltodict.hash
similarity index 100%
rename from software/package/python-xmltodict/python-xmltodict.hash
rename to buildroot/package/python-xmltodict/python-xmltodict.hash
diff --git a/software/package/python-xmltodict/python-xmltodict.mk b/buildroot/package/python-xmltodict/python-xmltodict.mk
similarity index 100%
rename from software/package/python-xmltodict/python-xmltodict.mk
rename to buildroot/package/python-xmltodict/python-xmltodict.mk
diff --git a/software/package/python-yarl/Config.in b/buildroot/package/python-yarl/Config.in
similarity index 100%
rename from software/package/python-yarl/Config.in
rename to buildroot/package/python-yarl/Config.in
diff --git a/software/package/python-yarl/python-yarl.hash b/buildroot/package/python-yarl/python-yarl.hash
similarity index 100%
rename from software/package/python-yarl/python-yarl.hash
rename to buildroot/package/python-yarl/python-yarl.hash
diff --git a/software/package/python-yarl/python-yarl.mk b/buildroot/package/python-yarl/python-yarl.mk
similarity index 100%
rename from software/package/python-yarl/python-yarl.mk
rename to buildroot/package/python-yarl/python-yarl.mk
diff --git a/software/package/python-yieldfrom/Config.in b/buildroot/package/python-yieldfrom/Config.in
similarity index 100%
rename from software/package/python-yieldfrom/Config.in
rename to buildroot/package/python-yieldfrom/Config.in
diff --git a/software/package/python-yieldfrom/python-yieldfrom.hash b/buildroot/package/python-yieldfrom/python-yieldfrom.hash
similarity index 100%
rename from software/package/python-yieldfrom/python-yieldfrom.hash
rename to buildroot/package/python-yieldfrom/python-yieldfrom.hash
diff --git a/software/package/python-yieldfrom/python-yieldfrom.mk b/buildroot/package/python-yieldfrom/python-yieldfrom.mk
similarity index 100%
rename from software/package/python-yieldfrom/python-yieldfrom.mk
rename to buildroot/package/python-yieldfrom/python-yieldfrom.mk
diff --git a/software/package/python-zc-lockfile/Config.in b/buildroot/package/python-zc-lockfile/Config.in
similarity index 100%
rename from software/package/python-zc-lockfile/Config.in
rename to buildroot/package/python-zc-lockfile/Config.in
diff --git a/software/package/python-zc-lockfile/python-zc-lockfile.hash b/buildroot/package/python-zc-lockfile/python-zc-lockfile.hash
similarity index 100%
rename from software/package/python-zc-lockfile/python-zc-lockfile.hash
rename to buildroot/package/python-zc-lockfile/python-zc-lockfile.hash
diff --git a/software/package/python-zc-lockfile/python-zc-lockfile.mk b/buildroot/package/python-zc-lockfile/python-zc-lockfile.mk
similarity index 100%
rename from software/package/python-zc-lockfile/python-zc-lockfile.mk
rename to buildroot/package/python-zc-lockfile/python-zc-lockfile.mk
diff --git a/software/package/python-zeroconf/Config.in b/buildroot/package/python-zeroconf/Config.in
similarity index 100%
rename from software/package/python-zeroconf/Config.in
rename to buildroot/package/python-zeroconf/Config.in
diff --git a/software/package/python-zeroconf/python-zeroconf.hash b/buildroot/package/python-zeroconf/python-zeroconf.hash
similarity index 100%
rename from software/package/python-zeroconf/python-zeroconf.hash
rename to buildroot/package/python-zeroconf/python-zeroconf.hash
diff --git a/software/package/python-zeroconf/python-zeroconf.mk b/buildroot/package/python-zeroconf/python-zeroconf.mk
similarity index 100%
rename from software/package/python-zeroconf/python-zeroconf.mk
rename to buildroot/package/python-zeroconf/python-zeroconf.mk
diff --git a/software/package/python-zope-interface/Config.in b/buildroot/package/python-zope-interface/Config.in
similarity index 100%
rename from software/package/python-zope-interface/Config.in
rename to buildroot/package/python-zope-interface/Config.in
diff --git a/software/package/python-zope-interface/python-zope-interface.hash b/buildroot/package/python-zope-interface/python-zope-interface.hash
similarity index 100%
rename from software/package/python-zope-interface/python-zope-interface.hash
rename to buildroot/package/python-zope-interface/python-zope-interface.hash
diff --git a/software/package/python-zope-interface/python-zope-interface.mk b/buildroot/package/python-zope-interface/python-zope-interface.mk
similarity index 100%
rename from software/package/python-zope-interface/python-zope-interface.mk
rename to buildroot/package/python-zope-interface/python-zope-interface.mk
diff --git a/software/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch b/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
similarity index 100%
rename from software/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
rename to buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
diff --git a/software/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch b/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
similarity index 100%
rename from software/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
rename to buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
diff --git a/software/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
similarity index 100%
rename from software/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
rename to buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
diff --git a/software/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
similarity index 100%
rename from software/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
rename to buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
diff --git a/software/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
similarity index 100%
rename from software/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
rename to buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
diff --git a/software/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
similarity index 100%
rename from software/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
rename to buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
diff --git a/software/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch b/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
similarity index 100%
rename from software/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
rename to buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
diff --git a/software/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
similarity index 100%
rename from software/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
rename to buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
diff --git a/software/package/python/0009-Fix-python-config-for-cross-builds.patch b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
similarity index 100%
rename from software/package/python/0009-Fix-python-config-for-cross-builds.patch
rename to buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
diff --git a/software/package/python/0010-Remove-the-python-symlink-install-rules.patch b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
similarity index 100%
rename from software/package/python/0010-Remove-the-python-symlink-install-rules.patch
rename to buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
diff --git a/software/package/python/0011-Don-t-add-multiarch-paths.patch b/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
similarity index 100%
rename from software/package/python/0011-Don-t-add-multiarch-paths.patch
rename to buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
diff --git a/software/package/python/0012-Abort-on-failed-module-build.patch b/buildroot/package/python/0012-Abort-on-failed-module-build.patch
similarity index 100%
rename from software/package/python/0012-Abort-on-failed-module-build.patch
rename to buildroot/package/python/0012-Abort-on-failed-module-build.patch
diff --git a/software/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch b/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
similarity index 100%
rename from software/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
rename to buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
diff --git a/software/package/python/0014-Serial-ioctl-workaround.patch b/buildroot/package/python/0014-Serial-ioctl-workaround.patch
similarity index 100%
rename from software/package/python/0014-Serial-ioctl-workaround.patch
rename to buildroot/package/python/0014-Serial-ioctl-workaround.patch
diff --git a/software/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
similarity index 100%
rename from software/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
rename to buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
diff --git a/software/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
similarity index 100%
rename from software/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
rename to buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
diff --git a/software/package/python/0017-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
similarity index 100%
rename from software/package/python/0017-Add-an-option-to-disable-pydoc.patch
rename to buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
diff --git a/software/package/python/0018-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
similarity index 100%
rename from software/package/python/0018-Add-an-option-to-disable-lib2to3.patch
rename to buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
diff --git a/software/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
similarity index 100%
rename from software/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
rename to buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
diff --git a/software/package/python/0020-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
similarity index 100%
rename from software/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
rename to buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
diff --git a/software/package/python/0021-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
similarity index 100%
rename from software/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
rename to buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
diff --git a/software/package/python/0022-Add-an-option-to-disable-expat.patch b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
similarity index 100%
rename from software/package/python/0022-Add-an-option-to-disable-expat.patch
rename to buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
diff --git a/software/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
similarity index 100%
rename from software/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
rename to buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
diff --git a/software/package/python/0024-Add-an-option-to-disable-NIS.patch b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
similarity index 100%
rename from software/package/python/0024-Add-an-option-to-disable-NIS.patch
rename to buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
diff --git a/software/package/python/0025-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
similarity index 100%
rename from software/package/python/0025-Add-an-option-to-disable-unicodedata.patch
rename to buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
diff --git a/software/package/python/0026-Add-an-option-to-disable-bsddb.patch b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
similarity index 100%
rename from software/package/python/0026-Add-an-option-to-disable-bsddb.patch
rename to buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
diff --git a/software/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
similarity index 100%
rename from software/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
rename to buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
diff --git a/software/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
similarity index 100%
rename from software/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
rename to buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
diff --git a/software/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
similarity index 100%
rename from software/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
rename to buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
diff --git a/software/package/python/0030-Do-not-install-the-idle-editor.patch b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
similarity index 100%
rename from software/package/python/0030-Do-not-install-the-idle-editor.patch
rename to buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
diff --git a/software/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
similarity index 100%
rename from software/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
rename to buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
diff --git a/software/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
similarity index 100%
rename from software/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
rename to buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
diff --git a/software/package/python/0033-Add-an-option-to-disable-readline-module.patch b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
similarity index 100%
rename from software/package/python/0033-Add-an-option-to-disable-readline-module.patch
rename to buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
diff --git a/software/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
similarity index 100%
rename from software/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
rename to buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
diff --git a/software/package/python/Config.in b/buildroot/package/python/Config.in
similarity index 100%
rename from software/package/python/Config.in
rename to buildroot/package/python/Config.in
diff --git a/software/package/python/Config.in.host b/buildroot/package/python/Config.in.host
similarity index 100%
rename from software/package/python/Config.in.host
rename to buildroot/package/python/Config.in.host
diff --git a/software/package/python/python.hash b/buildroot/package/python/python.hash
similarity index 100%
rename from software/package/python/python.hash
rename to buildroot/package/python/python.hash
diff --git a/software/package/python/python.mk b/buildroot/package/python/python.mk
similarity index 100%
rename from software/package/python/python.mk
rename to buildroot/package/python/python.mk
diff --git a/software/package/python3-mako/python3-mako.hash b/buildroot/package/python3-mako/python3-mako.hash
similarity index 100%
rename from software/package/python3-mako/python3-mako.hash
rename to buildroot/package/python3-mako/python3-mako.hash
diff --git a/software/package/python3-mako/python3-mako.mk b/buildroot/package/python3-mako/python3-mako.mk
similarity index 100%
rename from software/package/python3-mako/python3-mako.mk
rename to buildroot/package/python3-mako/python3-mako.mk
diff --git a/software/package/python3-setuptools/0001-add-executable.patch b/buildroot/package/python3-setuptools/0001-add-executable.patch
similarity index 100%
rename from software/package/python3-setuptools/0001-add-executable.patch
rename to buildroot/package/python3-setuptools/0001-add-executable.patch
diff --git a/software/package/python3-setuptools/python3-setuptools.hash b/buildroot/package/python3-setuptools/python3-setuptools.hash
similarity index 100%
rename from software/package/python3-setuptools/python3-setuptools.hash
rename to buildroot/package/python3-setuptools/python3-setuptools.hash
diff --git a/software/package/python3-setuptools/python3-setuptools.mk b/buildroot/package/python3-setuptools/python3-setuptools.mk
similarity index 100%
rename from software/package/python3-setuptools/python3-setuptools.mk
rename to buildroot/package/python3-setuptools/python3-setuptools.mk
diff --git a/software/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
similarity index 100%
rename from software/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
rename to buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
diff --git a/software/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
similarity index 100%
rename from software/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
rename to buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
diff --git a/software/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
similarity index 100%
rename from software/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
rename to buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
diff --git a/software/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
similarity index 100%
rename from software/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
rename to buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
diff --git a/software/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
similarity index 100%
rename from software/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
rename to buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
diff --git a/software/package/python3/0006-Don-t-add-multiarch-paths.patch b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
similarity index 100%
rename from software/package/python3/0006-Don-t-add-multiarch-paths.patch
rename to buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
diff --git a/software/package/python3/0007-Abort-on-failed-module-build.patch b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch
similarity index 100%
rename from software/package/python3/0007-Abort-on-failed-module-build.patch
rename to buildroot/package/python3/0007-Abort-on-failed-module-build.patch
diff --git a/software/package/python3/0008-Serial-ioctl-workaround.patch b/buildroot/package/python3/0008-Serial-ioctl-workaround.patch
similarity index 100%
rename from software/package/python3/0008-Serial-ioctl-workaround.patch
rename to buildroot/package/python3/0008-Serial-ioctl-workaround.patch
diff --git a/software/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
similarity index 100%
rename from software/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
rename to buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
diff --git a/software/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
similarity index 100%
rename from software/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
rename to buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
diff --git a/software/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
similarity index 100%
rename from software/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
rename to buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
diff --git a/software/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
similarity index 100%
rename from software/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
rename to buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
diff --git a/software/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
similarity index 100%
rename from software/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
rename to buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
diff --git a/software/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
similarity index 100%
rename from software/package/python3/0014-Add-an-option-to-disable-pydoc.patch
rename to buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
diff --git a/software/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
similarity index 100%
rename from software/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
rename to buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
diff --git a/software/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
similarity index 100%
rename from software/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
rename to buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
diff --git a/software/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
similarity index 100%
rename from software/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
rename to buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
diff --git a/software/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
similarity index 100%
rename from software/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
rename to buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
diff --git a/software/package/python3/0019-Add-an-option-to-disable-expat.patch b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
similarity index 100%
rename from software/package/python3/0019-Add-an-option-to-disable-expat.patch
rename to buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
diff --git a/software/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
similarity index 100%
rename from software/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
rename to buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
diff --git a/software/package/python3/0021-Add-an-option-to-disable-NIS.patch b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
similarity index 100%
rename from software/package/python3/0021-Add-an-option-to-disable-NIS.patch
rename to buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
diff --git a/software/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
similarity index 100%
rename from software/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
rename to buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
diff --git a/software/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
similarity index 100%
rename from software/package/python3/0023-Add-an-option-to-disable-IDLE.patch
rename to buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
diff --git a/software/package/python3/0024-Add-an-option-to-disable-decimal.patch b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
similarity index 100%
rename from software/package/python3/0024-Add-an-option-to-disable-decimal.patch
rename to buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
diff --git a/software/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
similarity index 100%
rename from software/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
rename to buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
diff --git a/software/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
similarity index 100%
rename from software/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
rename to buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
diff --git a/software/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
similarity index 100%
rename from software/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
rename to buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
diff --git a/software/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
similarity index 100%
rename from software/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
rename to buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
diff --git a/software/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
similarity index 100%
rename from software/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
rename to buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch
diff --git a/software/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
similarity index 100%
rename from software/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
rename to buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
diff --git a/software/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
similarity index 100%
rename from software/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
rename to buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
diff --git a/software/package/python3/0032-fix-building-on-older-distributions.patch b/buildroot/package/python3/0032-fix-building-on-older-distributions.patch
similarity index 100%
rename from software/package/python3/0032-fix-building-on-older-distributions.patch
rename to buildroot/package/python3/0032-fix-building-on-older-distributions.patch
diff --git a/software/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch
similarity index 100%
rename from software/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch
rename to buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch
diff --git a/software/package/python3/Config.in b/buildroot/package/python3/Config.in
similarity index 100%
rename from software/package/python3/Config.in
rename to buildroot/package/python3/Config.in
diff --git a/software/package/python3/Config.in.host b/buildroot/package/python3/Config.in.host
similarity index 100%
rename from software/package/python3/Config.in.host
rename to buildroot/package/python3/Config.in.host
diff --git a/software/package/python3/python3.hash b/buildroot/package/python3/python3.hash
similarity index 100%
rename from software/package/python3/python3.hash
rename to buildroot/package/python3/python3.hash
diff --git a/software/package/python3/python3.mk b/buildroot/package/python3/python3.mk
similarity index 100%
rename from software/package/python3/python3.mk
rename to buildroot/package/python3/python3.mk
diff --git a/software/package/qdecoder/Config.in b/buildroot/package/qdecoder/Config.in
similarity index 100%
rename from software/package/qdecoder/Config.in
rename to buildroot/package/qdecoder/Config.in
diff --git a/software/package/qdecoder/qdecoder.hash b/buildroot/package/qdecoder/qdecoder.hash
similarity index 100%
rename from software/package/qdecoder/qdecoder.hash
rename to buildroot/package/qdecoder/qdecoder.hash
diff --git a/software/package/qdecoder/qdecoder.mk b/buildroot/package/qdecoder/qdecoder.mk
similarity index 100%
rename from software/package/qdecoder/qdecoder.mk
rename to buildroot/package/qdecoder/qdecoder.mk
diff --git a/software/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
similarity index 100%
rename from software/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
rename to buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
diff --git a/software/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch
similarity index 100%
rename from software/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch
rename to buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch
diff --git a/software/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch
similarity index 100%
rename from software/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch
rename to buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch
diff --git a/software/package/qemu/Config.in b/buildroot/package/qemu/Config.in
similarity index 100%
rename from software/package/qemu/Config.in
rename to buildroot/package/qemu/Config.in
diff --git a/software/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host
similarity index 100%
rename from software/package/qemu/Config.in.host
rename to buildroot/package/qemu/Config.in.host
diff --git a/software/package/qemu/qemu.hash b/buildroot/package/qemu/qemu.hash
similarity index 100%
rename from software/package/qemu/qemu.hash
rename to buildroot/package/qemu/qemu.hash
diff --git a/software/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk
similarity index 100%
rename from software/package/qemu/qemu.mk
rename to buildroot/package/qemu/qemu.mk
diff --git a/software/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch b/buildroot/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch
similarity index 100%
rename from software/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch
rename to buildroot/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch
diff --git a/software/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch b/buildroot/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
similarity index 100%
rename from software/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
rename to buildroot/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
diff --git a/software/package/qextserialport/Config.in b/buildroot/package/qextserialport/Config.in
similarity index 100%
rename from software/package/qextserialport/Config.in
rename to buildroot/package/qextserialport/Config.in
diff --git a/software/package/qextserialport/qextserialport.hash b/buildroot/package/qextserialport/qextserialport.hash
similarity index 100%
rename from software/package/qextserialport/qextserialport.hash
rename to buildroot/package/qextserialport/qextserialport.hash
diff --git a/software/package/qextserialport/qextserialport.mk b/buildroot/package/qextserialport/qextserialport.mk
similarity index 100%
rename from software/package/qextserialport/qextserialport.mk
rename to buildroot/package/qextserialport/qextserialport.mk
diff --git a/software/package/qhull/Config.in b/buildroot/package/qhull/Config.in
similarity index 100%
rename from software/package/qhull/Config.in
rename to buildroot/package/qhull/Config.in
diff --git a/software/package/qhull/qhull.hash b/buildroot/package/qhull/qhull.hash
similarity index 100%
rename from software/package/qhull/qhull.hash
rename to buildroot/package/qhull/qhull.hash
diff --git a/software/package/qhull/qhull.mk b/buildroot/package/qhull/qhull.mk
similarity index 100%
rename from software/package/qhull/qhull.mk
rename to buildroot/package/qhull/qhull.mk
diff --git a/software/package/qjson/Config.in b/buildroot/package/qjson/Config.in
similarity index 100%
rename from software/package/qjson/Config.in
rename to buildroot/package/qjson/Config.in
diff --git a/software/package/qjson/qjson.hash b/buildroot/package/qjson/qjson.hash
similarity index 100%
rename from software/package/qjson/qjson.hash
rename to buildroot/package/qjson/qjson.hash
diff --git a/software/package/qjson/qjson.mk b/buildroot/package/qjson/qjson.mk
similarity index 100%
rename from software/package/qjson/qjson.mk
rename to buildroot/package/qjson/qjson.mk
diff --git a/software/package/qlibc/Config.in b/buildroot/package/qlibc/Config.in
similarity index 100%
rename from software/package/qlibc/Config.in
rename to buildroot/package/qlibc/Config.in
diff --git a/software/package/qlibc/qlibc.hash b/buildroot/package/qlibc/qlibc.hash
similarity index 100%
rename from software/package/qlibc/qlibc.hash
rename to buildroot/package/qlibc/qlibc.hash
diff --git a/software/package/qlibc/qlibc.mk b/buildroot/package/qlibc/qlibc.mk
similarity index 100%
rename from software/package/qlibc/qlibc.mk
rename to buildroot/package/qlibc/qlibc.mk
diff --git a/software/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch b/buildroot/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch
similarity index 100%
rename from software/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch
rename to buildroot/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch
diff --git a/software/package/qpdf/Config.in b/buildroot/package/qpdf/Config.in
similarity index 100%
rename from software/package/qpdf/Config.in
rename to buildroot/package/qpdf/Config.in
diff --git a/software/package/qpdf/qpdf.hash b/buildroot/package/qpdf/qpdf.hash
similarity index 100%
rename from software/package/qpdf/qpdf.hash
rename to buildroot/package/qpdf/qpdf.hash
diff --git a/software/package/qpdf/qpdf.mk b/buildroot/package/qpdf/qpdf.mk
similarity index 100%
rename from software/package/qpdf/qpdf.mk
rename to buildroot/package/qpdf/qpdf.mk
diff --git a/software/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch b/buildroot/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch
similarity index 100%
rename from software/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch
rename to buildroot/package/qpid-proton/0001-PROTON-1381-PROTON-1326-Modify-openssl-DH-code-to-wo.patch
diff --git a/software/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch b/buildroot/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch
similarity index 100%
rename from software/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch
rename to buildroot/package/qpid-proton/0002-PROTON-1326-restore-anonymous-cyphers-by-lowering-Op.patch
diff --git a/software/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch b/buildroot/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch
similarity index 100%
rename from software/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch
rename to buildroot/package/qpid-proton/0003-PROTON-1587-fix-openssl-error-handling-causing-spuri.patch
diff --git a/software/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch b/buildroot/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch
similarity index 100%
rename from software/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch
rename to buildroot/package/qpid-proton/0004-src-ssl-openssl-add-libressl-compatibility.patch
diff --git a/software/package/qpid-proton/Config.in b/buildroot/package/qpid-proton/Config.in
similarity index 100%
rename from software/package/qpid-proton/Config.in
rename to buildroot/package/qpid-proton/Config.in
diff --git a/software/package/qpid-proton/qpid-proton.hash b/buildroot/package/qpid-proton/qpid-proton.hash
similarity index 100%
rename from software/package/qpid-proton/qpid-proton.hash
rename to buildroot/package/qpid-proton/qpid-proton.hash
diff --git a/software/package/qpid-proton/qpid-proton.mk b/buildroot/package/qpid-proton/qpid-proton.mk
similarity index 100%
rename from software/package/qpid-proton/qpid-proton.mk
rename to buildroot/package/qpid-proton/qpid-proton.mk
diff --git a/software/package/qt-webkit-kiosk/Config.in b/buildroot/package/qt-webkit-kiosk/Config.in
similarity index 100%
rename from software/package/qt-webkit-kiosk/Config.in
rename to buildroot/package/qt-webkit-kiosk/Config.in
diff --git a/software/package/qt-webkit-kiosk/qt-webkit-kiosk.hash b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash
similarity index 100%
rename from software/package/qt-webkit-kiosk/qt-webkit-kiosk.hash
rename to buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash
diff --git a/software/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
similarity index 100%
rename from software/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
rename to buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
diff --git a/software/package/qt5/Config.in b/buildroot/package/qt5/Config.in
similarity index 100%
rename from software/package/qt5/Config.in
rename to buildroot/package/qt5/Config.in
diff --git a/software/package/qt5/qt5.mk b/buildroot/package/qt5/qt5.mk
similarity index 100%
rename from software/package/qt5/qt5.mk
rename to buildroot/package/qt5/qt5.mk
diff --git a/software/package/qt5/qt53d/Config.in b/buildroot/package/qt5/qt53d/Config.in
similarity index 100%
rename from software/package/qt5/qt53d/Config.in
rename to buildroot/package/qt5/qt53d/Config.in
diff --git a/software/package/qt5/qt53d/qt53d.hash b/buildroot/package/qt5/qt53d/qt53d.hash
similarity index 100%
rename from software/package/qt5/qt53d/qt53d.hash
rename to buildroot/package/qt5/qt53d/qt53d.hash
diff --git a/software/package/qt5/qt53d/qt53d.mk b/buildroot/package/qt5/qt53d/qt53d.mk
similarity index 100%
rename from software/package/qt5/qt53d/qt53d.mk
rename to buildroot/package/qt5/qt53d/qt53d.mk
diff --git a/software/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch b/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch
similarity index 100%
rename from software/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch
rename to buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch
diff --git a/software/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch
rename to buildroot/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch
diff --git a/software/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch b/buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch
rename to buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch
diff --git a/software/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch b/buildroot/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch
rename to buildroot/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch
diff --git a/software/package/qt5/qt5base/5.12.8/qt5base.hash b/buildroot/package/qt5/qt5base/5.12.8/qt5base.hash
similarity index 100%
rename from software/package/qt5/qt5base/5.12.8/qt5base.hash
rename to buildroot/package/qt5/qt5base/5.12.8/qt5base.hash
diff --git a/software/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch b/buildroot/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch
rename to buildroot/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch
diff --git a/software/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch
rename to buildroot/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch
diff --git a/software/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch b/buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
rename to buildroot/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
diff --git a/software/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch b/buildroot/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch
rename to buildroot/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch
diff --git a/software/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch b/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
similarity index 100%
rename from software/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
rename to buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
diff --git a/software/package/qt5/qt5base/5.6.3/qt5base.hash b/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash
similarity index 100%
rename from software/package/qt5/qt5base/5.6.3/qt5base.hash
rename to buildroot/package/qt5/qt5base/5.6.3/qt5base.hash
diff --git a/software/package/qt5/qt5base/Config.in b/buildroot/package/qt5/qt5base/Config.in
similarity index 100%
rename from software/package/qt5/qt5base/Config.in
rename to buildroot/package/qt5/qt5base/Config.in
diff --git a/software/package/qt5/qt5base/qmake.conf.in b/buildroot/package/qt5/qt5base/qmake.conf.in
similarity index 100%
rename from software/package/qt5/qt5base/qmake.conf.in
rename to buildroot/package/qt5/qt5base/qmake.conf.in
diff --git a/software/package/qt5/qt5base/qplatformdefs.h b/buildroot/package/qt5/qt5base/qplatformdefs.h
similarity index 100%
rename from software/package/qt5/qt5base/qplatformdefs.h
rename to buildroot/package/qt5/qt5base/qplatformdefs.h
diff --git a/software/package/qt5/qt5base/qt.conf.in b/buildroot/package/qt5/qt5base/qt.conf.in
similarity index 100%
rename from software/package/qt5/qt5base/qt.conf.in
rename to buildroot/package/qt5/qt5base/qt.conf.in
diff --git a/software/package/qt5/qt5base/qt5base.hash b/buildroot/package/qt5/qt5base/qt5base.hash
similarity index 100%
rename from software/package/qt5/qt5base/qt5base.hash
rename to buildroot/package/qt5/qt5base/qt5base.hash
diff --git a/software/package/qt5/qt5base/qt5base.mk b/buildroot/package/qt5/qt5base/qt5base.mk
similarity index 100%
rename from software/package/qt5/qt5base/qt5base.mk
rename to buildroot/package/qt5/qt5base/qt5base.mk
diff --git a/software/package/qt5/qt5canvas3d/Config.in b/buildroot/package/qt5/qt5canvas3d/Config.in
similarity index 100%
rename from software/package/qt5/qt5canvas3d/Config.in
rename to buildroot/package/qt5/qt5canvas3d/Config.in
diff --git a/software/package/qt5/qt5canvas3d/qt5canvas3d.hash b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
similarity index 100%
rename from software/package/qt5/qt5canvas3d/qt5canvas3d.hash
rename to buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
diff --git a/software/package/qt5/qt5canvas3d/qt5canvas3d.mk b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk
similarity index 100%
rename from software/package/qt5/qt5canvas3d/qt5canvas3d.mk
rename to buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk
diff --git a/software/package/qt5/qt5charts/Config.in b/buildroot/package/qt5/qt5charts/Config.in
similarity index 100%
rename from software/package/qt5/qt5charts/Config.in
rename to buildroot/package/qt5/qt5charts/Config.in
diff --git a/software/package/qt5/qt5charts/qt5charts.hash b/buildroot/package/qt5/qt5charts/qt5charts.hash
similarity index 100%
rename from software/package/qt5/qt5charts/qt5charts.hash
rename to buildroot/package/qt5/qt5charts/qt5charts.hash
diff --git a/software/package/qt5/qt5charts/qt5charts.mk b/buildroot/package/qt5/qt5charts/qt5charts.mk
similarity index 100%
rename from software/package/qt5/qt5charts/qt5charts.mk
rename to buildroot/package/qt5/qt5charts/qt5charts.mk
diff --git a/software/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash
similarity index 100%
rename from software/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash
rename to buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash
diff --git a/software/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash
similarity index 100%
rename from software/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash
rename to buildroot/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash
diff --git a/software/package/qt5/qt5connectivity/Config.in b/buildroot/package/qt5/qt5connectivity/Config.in
similarity index 100%
rename from software/package/qt5/qt5connectivity/Config.in
rename to buildroot/package/qt5/qt5connectivity/Config.in
diff --git a/software/package/qt5/qt5connectivity/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash
similarity index 100%
rename from software/package/qt5/qt5connectivity/qt5connectivity.hash
rename to buildroot/package/qt5/qt5connectivity/qt5connectivity.hash
diff --git a/software/package/qt5/qt5connectivity/qt5connectivity.mk b/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk
similarity index 100%
rename from software/package/qt5/qt5connectivity/qt5connectivity.mk
rename to buildroot/package/qt5/qt5connectivity/qt5connectivity.mk
diff --git a/software/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch
similarity index 100%
rename from software/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch
rename to buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch
diff --git a/software/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch b/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
similarity index 100%
rename from software/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
rename to buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
diff --git a/software/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
similarity index 100%
rename from software/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
rename to buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
diff --git a/software/package/qt5/qt5declarative/Config.in b/buildroot/package/qt5/qt5declarative/Config.in
similarity index 100%
rename from software/package/qt5/qt5declarative/Config.in
rename to buildroot/package/qt5/qt5declarative/Config.in
diff --git a/software/package/qt5/qt5declarative/qt5declarative.hash b/buildroot/package/qt5/qt5declarative/qt5declarative.hash
similarity index 100%
rename from software/package/qt5/qt5declarative/qt5declarative.hash
rename to buildroot/package/qt5/qt5declarative/qt5declarative.hash
diff --git a/software/package/qt5/qt5declarative/qt5declarative.mk b/buildroot/package/qt5/qt5declarative/qt5declarative.mk
similarity index 100%
rename from software/package/qt5/qt5declarative/qt5declarative.mk
rename to buildroot/package/qt5/qt5declarative/qt5declarative.mk
diff --git a/software/package/qt5/qt5enginio/Config.in b/buildroot/package/qt5/qt5enginio/Config.in
similarity index 100%
rename from software/package/qt5/qt5enginio/Config.in
rename to buildroot/package/qt5/qt5enginio/Config.in
diff --git a/software/package/qt5/qt5enginio/qt5enginio.hash b/buildroot/package/qt5/qt5enginio/qt5enginio.hash
similarity index 100%
rename from software/package/qt5/qt5enginio/qt5enginio.hash
rename to buildroot/package/qt5/qt5enginio/qt5enginio.hash
diff --git a/software/package/qt5/qt5enginio/qt5enginio.mk b/buildroot/package/qt5/qt5enginio/qt5enginio.mk
similarity index 100%
rename from software/package/qt5/qt5enginio/qt5enginio.mk
rename to buildroot/package/qt5/qt5enginio/qt5enginio.mk
diff --git a/software/package/qt5/qt5graphicaleffects/Config.in b/buildroot/package/qt5/qt5graphicaleffects/Config.in
similarity index 100%
rename from software/package/qt5/qt5graphicaleffects/Config.in
rename to buildroot/package/qt5/qt5graphicaleffects/Config.in
diff --git a/software/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
similarity index 100%
rename from software/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
rename to buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
diff --git a/software/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
similarity index 100%
rename from software/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
rename to buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
diff --git a/software/package/qt5/qt5imageformats/Config.in b/buildroot/package/qt5/qt5imageformats/Config.in
similarity index 100%
rename from software/package/qt5/qt5imageformats/Config.in
rename to buildroot/package/qt5/qt5imageformats/Config.in
diff --git a/software/package/qt5/qt5imageformats/qt5imageformats.hash b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
similarity index 100%
rename from software/package/qt5/qt5imageformats/qt5imageformats.hash
rename to buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
diff --git a/software/package/qt5/qt5imageformats/qt5imageformats.mk b/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk
similarity index 100%
rename from software/package/qt5/qt5imageformats/qt5imageformats.mk
rename to buildroot/package/qt5/qt5imageformats/qt5imageformats.mk
diff --git a/software/package/qt5/qt5location/Config.in b/buildroot/package/qt5/qt5location/Config.in
similarity index 100%
rename from software/package/qt5/qt5location/Config.in
rename to buildroot/package/qt5/qt5location/Config.in
diff --git a/software/package/qt5/qt5location/qt5location.hash b/buildroot/package/qt5/qt5location/qt5location.hash
similarity index 100%
rename from software/package/qt5/qt5location/qt5location.hash
rename to buildroot/package/qt5/qt5location/qt5location.hash
diff --git a/software/package/qt5/qt5location/qt5location.mk b/buildroot/package/qt5/qt5location/qt5location.mk
similarity index 100%
rename from software/package/qt5/qt5location/qt5location.mk
rename to buildroot/package/qt5/qt5location/qt5location.mk
diff --git a/software/package/qt5/qt5multimedia/Config.in b/buildroot/package/qt5/qt5multimedia/Config.in
similarity index 100%
rename from software/package/qt5/qt5multimedia/Config.in
rename to buildroot/package/qt5/qt5multimedia/Config.in
diff --git a/software/package/qt5/qt5multimedia/qt5multimedia.hash b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
similarity index 100%
rename from software/package/qt5/qt5multimedia/qt5multimedia.hash
rename to buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
diff --git a/software/package/qt5/qt5multimedia/qt5multimedia.mk b/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk
similarity index 100%
rename from software/package/qt5/qt5multimedia/qt5multimedia.mk
rename to buildroot/package/qt5/qt5multimedia/qt5multimedia.mk
diff --git a/software/package/qt5/qt5quickcontrols/Config.in b/buildroot/package/qt5/qt5quickcontrols/Config.in
similarity index 100%
rename from software/package/qt5/qt5quickcontrols/Config.in
rename to buildroot/package/qt5/qt5quickcontrols/Config.in
diff --git a/software/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
similarity index 100%
rename from software/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
rename to buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
diff --git a/software/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
similarity index 100%
rename from software/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
rename to buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
diff --git a/software/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash
similarity index 100%
rename from software/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash
rename to buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash
diff --git a/software/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
similarity index 100%
rename from software/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
rename to buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
diff --git a/software/package/qt5/qt5quickcontrols2/Config.in b/buildroot/package/qt5/qt5quickcontrols2/Config.in
similarity index 100%
rename from software/package/qt5/qt5quickcontrols2/Config.in
rename to buildroot/package/qt5/qt5quickcontrols2/Config.in
diff --git a/software/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
similarity index 100%
rename from software/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
rename to buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
diff --git a/software/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
similarity index 100%
rename from software/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
rename to buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
diff --git a/software/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch b/buildroot/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch
similarity index 100%
rename from software/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch
rename to buildroot/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch
diff --git a/software/package/qt5/qt5script/Config.in b/buildroot/package/qt5/qt5script/Config.in
similarity index 100%
rename from software/package/qt5/qt5script/Config.in
rename to buildroot/package/qt5/qt5script/Config.in
diff --git a/software/package/qt5/qt5script/qt5script.hash b/buildroot/package/qt5/qt5script/qt5script.hash
similarity index 100%
rename from software/package/qt5/qt5script/qt5script.hash
rename to buildroot/package/qt5/qt5script/qt5script.hash
diff --git a/software/package/qt5/qt5script/qt5script.mk b/buildroot/package/qt5/qt5script/qt5script.mk
similarity index 100%
rename from software/package/qt5/qt5script/qt5script.mk
rename to buildroot/package/qt5/qt5script/qt5script.mk
diff --git a/software/package/qt5/qt5scxml/Config.in b/buildroot/package/qt5/qt5scxml/Config.in
similarity index 100%
rename from software/package/qt5/qt5scxml/Config.in
rename to buildroot/package/qt5/qt5scxml/Config.in
diff --git a/software/package/qt5/qt5scxml/qt5scxml.hash b/buildroot/package/qt5/qt5scxml/qt5scxml.hash
similarity index 100%
rename from software/package/qt5/qt5scxml/qt5scxml.hash
rename to buildroot/package/qt5/qt5scxml/qt5scxml.hash
diff --git a/software/package/qt5/qt5scxml/qt5scxml.mk b/buildroot/package/qt5/qt5scxml/qt5scxml.mk
similarity index 100%
rename from software/package/qt5/qt5scxml/qt5scxml.mk
rename to buildroot/package/qt5/qt5scxml/qt5scxml.mk
diff --git a/software/package/qt5/qt5sensors/Config.in b/buildroot/package/qt5/qt5sensors/Config.in
similarity index 100%
rename from software/package/qt5/qt5sensors/Config.in
rename to buildroot/package/qt5/qt5sensors/Config.in
diff --git a/software/package/qt5/qt5sensors/qt5sensors.hash b/buildroot/package/qt5/qt5sensors/qt5sensors.hash
similarity index 100%
rename from software/package/qt5/qt5sensors/qt5sensors.hash
rename to buildroot/package/qt5/qt5sensors/qt5sensors.hash
diff --git a/software/package/qt5/qt5sensors/qt5sensors.mk b/buildroot/package/qt5/qt5sensors/qt5sensors.mk
similarity index 100%
rename from software/package/qt5/qt5sensors/qt5sensors.mk
rename to buildroot/package/qt5/qt5sensors/qt5sensors.mk
diff --git a/software/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash
similarity index 100%
rename from software/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash
rename to buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash
diff --git a/software/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch b/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch
similarity index 100%
rename from software/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch
rename to buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch
diff --git a/software/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
similarity index 100%
rename from software/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
rename to buildroot/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
diff --git a/software/package/qt5/qt5serialbus/Config.in b/buildroot/package/qt5/qt5serialbus/Config.in
similarity index 100%
rename from software/package/qt5/qt5serialbus/Config.in
rename to buildroot/package/qt5/qt5serialbus/Config.in
diff --git a/software/package/qt5/qt5serialbus/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash
similarity index 100%
rename from software/package/qt5/qt5serialbus/qt5serialbus.hash
rename to buildroot/package/qt5/qt5serialbus/qt5serialbus.hash
diff --git a/software/package/qt5/qt5serialbus/qt5serialbus.mk b/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk
similarity index 100%
rename from software/package/qt5/qt5serialbus/qt5serialbus.mk
rename to buildroot/package/qt5/qt5serialbus/qt5serialbus.mk
diff --git a/software/package/qt5/qt5serialport/5.12.8/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash
similarity index 100%
rename from software/package/qt5/qt5serialport/5.12.8/qt5serialport.hash
rename to buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash
diff --git a/software/package/qt5/qt5serialport/5.6.3/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.6.3/qt5serialport.hash
similarity index 100%
rename from software/package/qt5/qt5serialport/5.6.3/qt5serialport.hash
rename to buildroot/package/qt5/qt5serialport/5.6.3/qt5serialport.hash
diff --git a/software/package/qt5/qt5serialport/Config.in b/buildroot/package/qt5/qt5serialport/Config.in
similarity index 100%
rename from software/package/qt5/qt5serialport/Config.in
rename to buildroot/package/qt5/qt5serialport/Config.in
diff --git a/software/package/qt5/qt5serialport/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/qt5serialport.hash
similarity index 100%
rename from software/package/qt5/qt5serialport/qt5serialport.hash
rename to buildroot/package/qt5/qt5serialport/qt5serialport.hash
diff --git a/software/package/qt5/qt5serialport/qt5serialport.mk b/buildroot/package/qt5/qt5serialport/qt5serialport.mk
similarity index 100%
rename from software/package/qt5/qt5serialport/qt5serialport.mk
rename to buildroot/package/qt5/qt5serialport/qt5serialport.mk
diff --git a/software/package/qt5/qt5svg/Config.in b/buildroot/package/qt5/qt5svg/Config.in
similarity index 100%
rename from software/package/qt5/qt5svg/Config.in
rename to buildroot/package/qt5/qt5svg/Config.in
diff --git a/software/package/qt5/qt5svg/qt5svg.hash b/buildroot/package/qt5/qt5svg/qt5svg.hash
similarity index 100%
rename from software/package/qt5/qt5svg/qt5svg.hash
rename to buildroot/package/qt5/qt5svg/qt5svg.hash
diff --git a/software/package/qt5/qt5svg/qt5svg.mk b/buildroot/package/qt5/qt5svg/qt5svg.mk
similarity index 100%
rename from software/package/qt5/qt5svg/qt5svg.mk
rename to buildroot/package/qt5/qt5svg/qt5svg.mk
diff --git a/software/package/qt5/qt5tools/Config.in b/buildroot/package/qt5/qt5tools/Config.in
similarity index 100%
rename from software/package/qt5/qt5tools/Config.in
rename to buildroot/package/qt5/qt5tools/Config.in
diff --git a/software/package/qt5/qt5tools/qt5tools.hash b/buildroot/package/qt5/qt5tools/qt5tools.hash
similarity index 100%
rename from software/package/qt5/qt5tools/qt5tools.hash
rename to buildroot/package/qt5/qt5tools/qt5tools.hash
diff --git a/software/package/qt5/qt5tools/qt5tools.mk b/buildroot/package/qt5/qt5tools/qt5tools.mk
similarity index 100%
rename from software/package/qt5/qt5tools/qt5tools.mk
rename to buildroot/package/qt5/qt5tools/qt5tools.mk
diff --git a/software/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch b/buildroot/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
similarity index 100%
rename from software/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
rename to buildroot/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
diff --git a/software/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
similarity index 100%
rename from software/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
rename to buildroot/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
diff --git a/software/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash
similarity index 100%
rename from software/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash
rename to buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash
diff --git a/software/package/qt5/qt5virtualkeyboard/Config.in b/buildroot/package/qt5/qt5virtualkeyboard/Config.in
similarity index 100%
rename from software/package/qt5/qt5virtualkeyboard/Config.in
rename to buildroot/package/qt5/qt5virtualkeyboard/Config.in
diff --git a/software/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
similarity index 100%
rename from software/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
rename to buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
diff --git a/software/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
similarity index 100%
rename from software/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
rename to buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
diff --git a/software/package/qt5/qt5wayland/Config.in b/buildroot/package/qt5/qt5wayland/Config.in
similarity index 100%
rename from software/package/qt5/qt5wayland/Config.in
rename to buildroot/package/qt5/qt5wayland/Config.in
diff --git a/software/package/qt5/qt5wayland/qt5wayland.hash b/buildroot/package/qt5/qt5wayland/qt5wayland.hash
similarity index 100%
rename from software/package/qt5/qt5wayland/qt5wayland.hash
rename to buildroot/package/qt5/qt5wayland/qt5wayland.hash
diff --git a/software/package/qt5/qt5wayland/qt5wayland.mk b/buildroot/package/qt5/qt5wayland/qt5wayland.mk
similarity index 100%
rename from software/package/qt5/qt5wayland/qt5wayland.mk
rename to buildroot/package/qt5/qt5wayland/qt5wayland.mk
diff --git a/software/package/qt5/qt5webchannel/Config.in b/buildroot/package/qt5/qt5webchannel/Config.in
similarity index 100%
rename from software/package/qt5/qt5webchannel/Config.in
rename to buildroot/package/qt5/qt5webchannel/Config.in
diff --git a/software/package/qt5/qt5webchannel/qt5webchannel.hash b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
similarity index 100%
rename from software/package/qt5/qt5webchannel/qt5webchannel.hash
rename to buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
diff --git a/software/package/qt5/qt5webchannel/qt5webchannel.mk b/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk
similarity index 100%
rename from software/package/qt5/qt5webchannel/qt5webchannel.mk
rename to buildroot/package/qt5/qt5webchannel/qt5webchannel.mk
diff --git a/software/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch b/buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch
similarity index 100%
rename from software/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch
rename to buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch
diff --git a/software/package/qt5/qt5webengine/5.12.8/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash
similarity index 100%
rename from software/package/qt5/qt5webengine/5.12.8/qt5webengine.hash
rename to buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash
diff --git a/software/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch b/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
similarity index 100%
rename from software/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
rename to buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
diff --git a/software/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
similarity index 100%
rename from software/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
rename to buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
diff --git a/software/package/qt5/qt5webengine/5.6.3/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash
similarity index 100%
rename from software/package/qt5/qt5webengine/5.6.3/qt5webengine.hash
rename to buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash
diff --git a/software/package/qt5/qt5webengine/Config.in b/buildroot/package/qt5/qt5webengine/Config.in
similarity index 100%
rename from software/package/qt5/qt5webengine/Config.in
rename to buildroot/package/qt5/qt5webengine/Config.in
diff --git a/software/package/qt5/qt5webengine/chromium-latest.inc b/buildroot/package/qt5/qt5webengine/chromium-latest.inc
similarity index 100%
rename from software/package/qt5/qt5webengine/chromium-latest.inc
rename to buildroot/package/qt5/qt5webengine/chromium-latest.inc
diff --git a/software/package/qt5/qt5webengine/chromium-lts.inc b/buildroot/package/qt5/qt5webengine/chromium-lts.inc
similarity index 100%
rename from software/package/qt5/qt5webengine/chromium-lts.inc
rename to buildroot/package/qt5/qt5webengine/chromium-lts.inc
diff --git a/software/package/qt5/qt5webengine/host-pkg-config.in b/buildroot/package/qt5/qt5webengine/host-pkg-config.in
similarity index 100%
rename from software/package/qt5/qt5webengine/host-pkg-config.in
rename to buildroot/package/qt5/qt5webengine/host-pkg-config.in
diff --git a/software/package/qt5/qt5webengine/qt5webengine.mk b/buildroot/package/qt5/qt5webengine/qt5webengine.mk
similarity index 100%
rename from software/package/qt5/qt5webengine/qt5webengine.mk
rename to buildroot/package/qt5/qt5webengine/qt5webengine.mk
diff --git a/software/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/buildroot/package/qt5/qt5webkit-examples/0001-Build-examples.patch
similarity index 100%
rename from software/package/qt5/qt5webkit-examples/0001-Build-examples.patch
rename to buildroot/package/qt5/qt5webkit-examples/0001-Build-examples.patch
diff --git a/software/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/buildroot/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch
similarity index 100%
rename from software/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch
rename to buildroot/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch
diff --git a/software/package/qt5/qt5webkit-examples/Config.in b/buildroot/package/qt5/qt5webkit-examples/Config.in
similarity index 100%
rename from software/package/qt5/qt5webkit-examples/Config.in
rename to buildroot/package/qt5/qt5webkit-examples/Config.in
diff --git a/software/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
similarity index 100%
rename from software/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
rename to buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
diff --git a/software/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
similarity index 100%
rename from software/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
rename to buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
diff --git a/software/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
rename to buildroot/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
diff --git a/software/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
rename to buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
diff --git a/software/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
rename to buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff --git a/software/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
rename to buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
diff --git a/software/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch b/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
rename to buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
diff --git a/software/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
rename to buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
diff --git a/software/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
rename to buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff --git a/software/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch
rename to buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch
diff --git a/software/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch
rename to buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch
diff --git a/software/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch
similarity index 100%
rename from software/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch
rename to buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch
diff --git a/software/package/qt5/qt5webkit/Config.in b/buildroot/package/qt5/qt5webkit/Config.in
similarity index 100%
rename from software/package/qt5/qt5webkit/Config.in
rename to buildroot/package/qt5/qt5webkit/Config.in
diff --git a/software/package/qt5/qt5webkit/qt5webkit.hash b/buildroot/package/qt5/qt5webkit/qt5webkit.hash
similarity index 100%
rename from software/package/qt5/qt5webkit/qt5webkit.hash
rename to buildroot/package/qt5/qt5webkit/qt5webkit.hash
diff --git a/software/package/qt5/qt5webkit/qt5webkit.mk b/buildroot/package/qt5/qt5webkit/qt5webkit.mk
similarity index 100%
rename from software/package/qt5/qt5webkit/qt5webkit.mk
rename to buildroot/package/qt5/qt5webkit/qt5webkit.mk
diff --git a/software/package/qt5/qt5websockets/Config.in b/buildroot/package/qt5/qt5websockets/Config.in
similarity index 100%
rename from software/package/qt5/qt5websockets/Config.in
rename to buildroot/package/qt5/qt5websockets/Config.in
diff --git a/software/package/qt5/qt5websockets/qt5websockets.hash b/buildroot/package/qt5/qt5websockets/qt5websockets.hash
similarity index 100%
rename from software/package/qt5/qt5websockets/qt5websockets.hash
rename to buildroot/package/qt5/qt5websockets/qt5websockets.hash
diff --git a/software/package/qt5/qt5websockets/qt5websockets.mk b/buildroot/package/qt5/qt5websockets/qt5websockets.mk
similarity index 100%
rename from software/package/qt5/qt5websockets/qt5websockets.mk
rename to buildroot/package/qt5/qt5websockets/qt5websockets.mk
diff --git a/software/package/qt5/qt5webview/Config.in b/buildroot/package/qt5/qt5webview/Config.in
similarity index 100%
rename from software/package/qt5/qt5webview/Config.in
rename to buildroot/package/qt5/qt5webview/Config.in
diff --git a/software/package/qt5/qt5webview/qt5webview.hash b/buildroot/package/qt5/qt5webview/qt5webview.hash
similarity index 100%
rename from software/package/qt5/qt5webview/qt5webview.hash
rename to buildroot/package/qt5/qt5webview/qt5webview.hash
diff --git a/software/package/qt5/qt5webview/qt5webview.mk b/buildroot/package/qt5/qt5webview/qt5webview.mk
similarity index 100%
rename from software/package/qt5/qt5webview/qt5webview.mk
rename to buildroot/package/qt5/qt5webview/qt5webview.mk
diff --git a/software/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash
similarity index 100%
rename from software/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash
rename to buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash
diff --git a/software/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash
similarity index 100%
rename from software/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash
rename to buildroot/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash
diff --git a/software/package/qt5/qt5x11extras/Config.in b/buildroot/package/qt5/qt5x11extras/Config.in
similarity index 100%
rename from software/package/qt5/qt5x11extras/Config.in
rename to buildroot/package/qt5/qt5x11extras/Config.in
diff --git a/software/package/qt5/qt5x11extras/qt5x11extras.mk b/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk
similarity index 100%
rename from software/package/qt5/qt5x11extras/qt5x11extras.mk
rename to buildroot/package/qt5/qt5x11extras/qt5x11extras.mk
diff --git a/software/package/qt5/qt5xmlpatterns/Config.in b/buildroot/package/qt5/qt5xmlpatterns/Config.in
similarity index 100%
rename from software/package/qt5/qt5xmlpatterns/Config.in
rename to buildroot/package/qt5/qt5xmlpatterns/Config.in
diff --git a/software/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
similarity index 100%
rename from software/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
rename to buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
diff --git a/software/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
similarity index 100%
rename from software/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
rename to buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
diff --git a/software/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch b/buildroot/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch
similarity index 100%
rename from software/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch
rename to buildroot/package/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch
diff --git a/software/package/qt5cinex/CinematicExperience-demo b/buildroot/package/qt5cinex/CinematicExperience-demo
similarity index 100%
rename from software/package/qt5cinex/CinematicExperience-demo
rename to buildroot/package/qt5cinex/CinematicExperience-demo
diff --git a/software/package/qt5cinex/Config.in b/buildroot/package/qt5cinex/Config.in
similarity index 100%
rename from software/package/qt5cinex/Config.in
rename to buildroot/package/qt5cinex/Config.in
diff --git a/software/package/qt5cinex/qt5cinex.hash b/buildroot/package/qt5cinex/qt5cinex.hash
similarity index 100%
rename from software/package/qt5cinex/qt5cinex.hash
rename to buildroot/package/qt5cinex/qt5cinex.hash
diff --git a/software/package/qt5cinex/qt5cinex.mk b/buildroot/package/qt5cinex/qt5cinex.mk
similarity index 100%
rename from software/package/qt5cinex/qt5cinex.mk
rename to buildroot/package/qt5cinex/qt5cinex.mk
diff --git a/software/package/quagga/0001-fix-ipctl-forwarding.patch b/buildroot/package/quagga/0001-fix-ipctl-forwarding.patch
similarity index 100%
rename from software/package/quagga/0001-fix-ipctl-forwarding.patch
rename to buildroot/package/quagga/0001-fix-ipctl-forwarding.patch
diff --git a/software/package/quagga/Config.in b/buildroot/package/quagga/Config.in
similarity index 100%
rename from software/package/quagga/Config.in
rename to buildroot/package/quagga/Config.in
diff --git a/software/package/quagga/quagga.hash b/buildroot/package/quagga/quagga.hash
similarity index 100%
rename from software/package/quagga/quagga.hash
rename to buildroot/package/quagga/quagga.hash
diff --git a/software/package/quagga/quagga.mk b/buildroot/package/quagga/quagga.mk
similarity index 100%
rename from software/package/quagga/quagga.mk
rename to buildroot/package/quagga/quagga.mk
diff --git a/software/package/quagga/quagga@.service b/buildroot/package/quagga/quagga@.service
similarity index 100%
rename from software/package/quagga/quagga@.service
rename to buildroot/package/quagga/quagga@.service
diff --git a/software/package/quagga/quagga_tmpfiles.conf b/buildroot/package/quagga/quagga_tmpfiles.conf
similarity index 100%
rename from software/package/quagga/quagga_tmpfiles.conf
rename to buildroot/package/quagga/quagga_tmpfiles.conf
diff --git a/software/package/quazip/0001-fix-qztest-build-error.patch b/buildroot/package/quazip/0001-fix-qztest-build-error.patch
similarity index 100%
rename from software/package/quazip/0001-fix-qztest-build-error.patch
rename to buildroot/package/quazip/0001-fix-qztest-build-error.patch
diff --git a/software/package/quazip/Config.in b/buildroot/package/quazip/Config.in
similarity index 100%
rename from software/package/quazip/Config.in
rename to buildroot/package/quazip/Config.in
diff --git a/software/package/quazip/quazip.hash b/buildroot/package/quazip/quazip.hash
similarity index 100%
rename from software/package/quazip/quazip.hash
rename to buildroot/package/quazip/quazip.hash
diff --git a/software/package/quazip/quazip.mk b/buildroot/package/quazip/quazip.mk
similarity index 100%
rename from software/package/quazip/quazip.mk
rename to buildroot/package/quazip/quazip.mk
diff --git a/software/package/quota/0001-configure.ac-add-disable-pie-option.patch b/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch
similarity index 100%
rename from software/package/quota/0001-configure.ac-add-disable-pie-option.patch
rename to buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch
diff --git a/software/package/quota/Config.in b/buildroot/package/quota/Config.in
similarity index 100%
rename from software/package/quota/Config.in
rename to buildroot/package/quota/Config.in
diff --git a/software/package/quota/quota.hash b/buildroot/package/quota/quota.hash
similarity index 100%
rename from software/package/quota/quota.hash
rename to buildroot/package/quota/quota.hash
diff --git a/software/package/quota/quota.mk b/buildroot/package/quota/quota.mk
similarity index 100%
rename from software/package/quota/quota.mk
rename to buildroot/package/quota/quota.mk
diff --git a/software/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch b/buildroot/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch
similarity index 100%
rename from software/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch
rename to buildroot/package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch
diff --git a/software/package/quotatool/Config.in b/buildroot/package/quotatool/Config.in
similarity index 100%
rename from software/package/quotatool/Config.in
rename to buildroot/package/quotatool/Config.in
diff --git a/software/package/quotatool/quotatool.hash b/buildroot/package/quotatool/quotatool.hash
similarity index 100%
rename from software/package/quotatool/quotatool.hash
rename to buildroot/package/quotatool/quotatool.hash
diff --git a/software/package/quotatool/quotatool.mk b/buildroot/package/quotatool/quotatool.mk
similarity index 100%
rename from software/package/quotatool/quotatool.mk
rename to buildroot/package/quotatool/quotatool.mk
diff --git a/software/package/qwt/Config.in b/buildroot/package/qwt/Config.in
similarity index 100%
rename from software/package/qwt/Config.in
rename to buildroot/package/qwt/Config.in
diff --git a/software/package/qwt/qwt.hash b/buildroot/package/qwt/qwt.hash
similarity index 100%
rename from software/package/qwt/qwt.hash
rename to buildroot/package/qwt/qwt.hash
diff --git a/software/package/qwt/qwt.mk b/buildroot/package/qwt/qwt.mk
similarity index 100%
rename from software/package/qwt/qwt.mk
rename to buildroot/package/qwt/qwt.mk
diff --git a/software/package/rabbitmq-c/Config.in b/buildroot/package/rabbitmq-c/Config.in
similarity index 100%
rename from software/package/rabbitmq-c/Config.in
rename to buildroot/package/rabbitmq-c/Config.in
diff --git a/software/package/rabbitmq-c/rabbitmq-c.hash b/buildroot/package/rabbitmq-c/rabbitmq-c.hash
similarity index 100%
rename from software/package/rabbitmq-c/rabbitmq-c.hash
rename to buildroot/package/rabbitmq-c/rabbitmq-c.hash
diff --git a/software/package/rabbitmq-c/rabbitmq-c.mk b/buildroot/package/rabbitmq-c/rabbitmq-c.mk
similarity index 100%
rename from software/package/rabbitmq-c/rabbitmq-c.mk
rename to buildroot/package/rabbitmq-c/rabbitmq-c.mk
diff --git a/software/package/rabbitmq-server/Config.in b/buildroot/package/rabbitmq-server/Config.in
similarity index 100%
rename from software/package/rabbitmq-server/Config.in
rename to buildroot/package/rabbitmq-server/Config.in
diff --git a/software/package/rabbitmq-server/S50rabbitmq-server b/buildroot/package/rabbitmq-server/S50rabbitmq-server
similarity index 100%
rename from software/package/rabbitmq-server/S50rabbitmq-server
rename to buildroot/package/rabbitmq-server/S50rabbitmq-server
diff --git a/software/package/rabbitmq-server/rabbitmq-server.hash b/buildroot/package/rabbitmq-server/rabbitmq-server.hash
similarity index 100%
rename from software/package/rabbitmq-server/rabbitmq-server.hash
rename to buildroot/package/rabbitmq-server/rabbitmq-server.hash
diff --git a/software/package/rabbitmq-server/rabbitmq-server.mk b/buildroot/package/rabbitmq-server/rabbitmq-server.mk
similarity index 100%
rename from software/package/rabbitmq-server/rabbitmq-server.mk
rename to buildroot/package/rabbitmq-server/rabbitmq-server.mk
diff --git a/software/package/rabbitmq-server/rabbitmq-server.service b/buildroot/package/rabbitmq-server/rabbitmq-server.service
similarity index 100%
rename from software/package/rabbitmq-server/rabbitmq-server.service
rename to buildroot/package/rabbitmq-server/rabbitmq-server.service
diff --git a/software/package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch b/buildroot/package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch
similarity index 100%
rename from software/package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch
rename to buildroot/package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch
diff --git a/software/package/racehound/Config.in b/buildroot/package/racehound/Config.in
similarity index 100%
rename from software/package/racehound/Config.in
rename to buildroot/package/racehound/Config.in
diff --git a/software/package/racehound/racehound.hash b/buildroot/package/racehound/racehound.hash
similarity index 100%
rename from software/package/racehound/racehound.hash
rename to buildroot/package/racehound/racehound.hash
diff --git a/software/package/racehound/racehound.mk b/buildroot/package/racehound/racehound.mk
similarity index 100%
rename from software/package/racehound/racehound.mk
rename to buildroot/package/racehound/racehound.mk
diff --git a/software/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch b/buildroot/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch
similarity index 100%
rename from software/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch
rename to buildroot/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch
diff --git a/software/package/radvd/50-radvd.preset b/buildroot/package/radvd/50-radvd.preset
similarity index 100%
rename from software/package/radvd/50-radvd.preset
rename to buildroot/package/radvd/50-radvd.preset
diff --git a/software/package/radvd/Config.in b/buildroot/package/radvd/Config.in
similarity index 100%
rename from software/package/radvd/Config.in
rename to buildroot/package/radvd/Config.in
diff --git a/software/package/radvd/S50radvd b/buildroot/package/radvd/S50radvd
similarity index 100%
rename from software/package/radvd/S50radvd
rename to buildroot/package/radvd/S50radvd
diff --git a/software/package/radvd/radvd.hash b/buildroot/package/radvd/radvd.hash
similarity index 100%
rename from software/package/radvd/radvd.hash
rename to buildroot/package/radvd/radvd.hash
diff --git a/software/package/radvd/radvd.mk b/buildroot/package/radvd/radvd.mk
similarity index 100%
rename from software/package/radvd/radvd.mk
rename to buildroot/package/radvd/radvd.mk
diff --git a/software/package/ramsmp/Config.in b/buildroot/package/ramsmp/Config.in
similarity index 100%
rename from software/package/ramsmp/Config.in
rename to buildroot/package/ramsmp/Config.in
diff --git a/software/package/ramsmp/Makefile b/buildroot/package/ramsmp/Makefile
similarity index 100%
rename from software/package/ramsmp/Makefile
rename to buildroot/package/ramsmp/Makefile
diff --git a/software/package/ramsmp/ramsmp.hash b/buildroot/package/ramsmp/ramsmp.hash
similarity index 100%
rename from software/package/ramsmp/ramsmp.hash
rename to buildroot/package/ramsmp/ramsmp.hash
diff --git a/software/package/ramsmp/ramsmp.mk b/buildroot/package/ramsmp/ramsmp.mk
similarity index 100%
rename from software/package/ramsmp/ramsmp.mk
rename to buildroot/package/ramsmp/ramsmp.mk
diff --git a/software/package/ramspeed/Config.in b/buildroot/package/ramspeed/Config.in
similarity index 100%
rename from software/package/ramspeed/Config.in
rename to buildroot/package/ramspeed/Config.in
diff --git a/software/package/ramspeed/Makefile b/buildroot/package/ramspeed/Makefile
similarity index 100%
rename from software/package/ramspeed/Makefile
rename to buildroot/package/ramspeed/Makefile
diff --git a/software/package/ramspeed/ramspeed.hash b/buildroot/package/ramspeed/ramspeed.hash
similarity index 100%
rename from software/package/ramspeed/ramspeed.hash
rename to buildroot/package/ramspeed/ramspeed.hash
diff --git a/software/package/ramspeed/ramspeed.mk b/buildroot/package/ramspeed/ramspeed.mk
similarity index 100%
rename from software/package/ramspeed/ramspeed.mk
rename to buildroot/package/ramspeed/ramspeed.mk
diff --git a/software/package/ranger/0001-colorscheme-check-for-compiled-python-files.patch b/buildroot/package/ranger/0001-colorscheme-check-for-compiled-python-files.patch
similarity index 100%
rename from software/package/ranger/0001-colorscheme-check-for-compiled-python-files.patch
rename to buildroot/package/ranger/0001-colorscheme-check-for-compiled-python-files.patch
diff --git a/software/package/ranger/Config.in b/buildroot/package/ranger/Config.in
similarity index 100%
rename from software/package/ranger/Config.in
rename to buildroot/package/ranger/Config.in
diff --git a/software/package/ranger/ranger.hash b/buildroot/package/ranger/ranger.hash
similarity index 100%
rename from software/package/ranger/ranger.hash
rename to buildroot/package/ranger/ranger.hash
diff --git a/software/package/ranger/ranger.mk b/buildroot/package/ranger/ranger.mk
similarity index 100%
rename from software/package/ranger/ranger.mk
rename to buildroot/package/ranger/ranger.mk
diff --git a/software/package/rapidjson/Config.in b/buildroot/package/rapidjson/Config.in
similarity index 100%
rename from software/package/rapidjson/Config.in
rename to buildroot/package/rapidjson/Config.in
diff --git a/software/package/rapidjson/rapidjson.hash b/buildroot/package/rapidjson/rapidjson.hash
similarity index 100%
rename from software/package/rapidjson/rapidjson.hash
rename to buildroot/package/rapidjson/rapidjson.hash
diff --git a/software/package/rapidjson/rapidjson.mk b/buildroot/package/rapidjson/rapidjson.mk
similarity index 100%
rename from software/package/rapidjson/rapidjson.mk
rename to buildroot/package/rapidjson/rapidjson.mk
diff --git a/software/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch b/buildroot/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch
similarity index 100%
rename from software/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch
rename to buildroot/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch
diff --git a/software/package/rapidxml/Config.in b/buildroot/package/rapidxml/Config.in
similarity index 100%
rename from software/package/rapidxml/Config.in
rename to buildroot/package/rapidxml/Config.in
diff --git a/software/package/rapidxml/rapidxml.hash b/buildroot/package/rapidxml/rapidxml.hash
similarity index 100%
rename from software/package/rapidxml/rapidxml.hash
rename to buildroot/package/rapidxml/rapidxml.hash
diff --git a/software/package/rapidxml/rapidxml.mk b/buildroot/package/rapidxml/rapidxml.mk
similarity index 100%
rename from software/package/rapidxml/rapidxml.mk
rename to buildroot/package/rapidxml/rapidxml.mk
diff --git a/software/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch b/buildroot/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
similarity index 100%
rename from software/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
rename to buildroot/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
diff --git a/software/package/raptor/Config.in b/buildroot/package/raptor/Config.in
similarity index 100%
rename from software/package/raptor/Config.in
rename to buildroot/package/raptor/Config.in
diff --git a/software/package/raptor/raptor.hash b/buildroot/package/raptor/raptor.hash
similarity index 100%
rename from software/package/raptor/raptor.hash
rename to buildroot/package/raptor/raptor.hash
diff --git a/software/package/raptor/raptor.mk b/buildroot/package/raptor/raptor.mk
similarity index 100%
rename from software/package/raptor/raptor.mk
rename to buildroot/package/raptor/raptor.mk
diff --git a/software/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/buildroot/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
similarity index 100%
rename from software/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
rename to buildroot/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch
diff --git a/software/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch b/buildroot/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch
similarity index 100%
rename from software/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch
rename to buildroot/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch
diff --git a/software/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch b/buildroot/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch
similarity index 100%
rename from software/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch
rename to buildroot/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch
diff --git a/software/package/raspberrypi-usbboot/Config.in.host b/buildroot/package/raspberrypi-usbboot/Config.in.host
similarity index 100%
rename from software/package/raspberrypi-usbboot/Config.in.host
rename to buildroot/package/raspberrypi-usbboot/Config.in.host
diff --git a/software/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/buildroot/package/raspberrypi-usbboot/raspberrypi-usbboot.hash
similarity index 100%
rename from software/package/raspberrypi-usbboot/raspberrypi-usbboot.hash
rename to buildroot/package/raspberrypi-usbboot/raspberrypi-usbboot.hash
diff --git a/software/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/buildroot/package/raspberrypi-usbboot/raspberrypi-usbboot.mk
similarity index 100%
rename from software/package/raspberrypi-usbboot/raspberrypi-usbboot.mk
rename to buildroot/package/raspberrypi-usbboot/raspberrypi-usbboot.mk
diff --git a/software/package/raspi-gpio/Config.in b/buildroot/package/raspi-gpio/Config.in
similarity index 100%
rename from software/package/raspi-gpio/Config.in
rename to buildroot/package/raspi-gpio/Config.in
diff --git a/software/package/raspi-gpio/raspi-gpio.hash b/buildroot/package/raspi-gpio/raspi-gpio.hash
similarity index 100%
rename from software/package/raspi-gpio/raspi-gpio.hash
rename to buildroot/package/raspi-gpio/raspi-gpio.hash
diff --git a/software/package/raspi-gpio/raspi-gpio.mk b/buildroot/package/raspi-gpio/raspi-gpio.mk
similarity index 100%
rename from software/package/raspi-gpio/raspi-gpio.mk
rename to buildroot/package/raspi-gpio/raspi-gpio.mk
diff --git a/software/package/ratpoison/Config.in b/buildroot/package/ratpoison/Config.in
similarity index 100%
rename from software/package/ratpoison/Config.in
rename to buildroot/package/ratpoison/Config.in
diff --git a/software/package/ratpoison/ratpoison.hash b/buildroot/package/ratpoison/ratpoison.hash
similarity index 100%
rename from software/package/ratpoison/ratpoison.hash
rename to buildroot/package/ratpoison/ratpoison.hash
diff --git a/software/package/ratpoison/ratpoison.mk b/buildroot/package/ratpoison/ratpoison.mk
similarity index 100%
rename from software/package/ratpoison/ratpoison.mk
rename to buildroot/package/ratpoison/ratpoison.mk
diff --git a/software/package/rauc/Config.in b/buildroot/package/rauc/Config.in
similarity index 100%
rename from software/package/rauc/Config.in
rename to buildroot/package/rauc/Config.in
diff --git a/software/package/rauc/Config.in.host b/buildroot/package/rauc/Config.in.host
similarity index 100%
rename from software/package/rauc/Config.in.host
rename to buildroot/package/rauc/Config.in.host
diff --git a/software/package/rauc/rauc.hash b/buildroot/package/rauc/rauc.hash
similarity index 100%
rename from software/package/rauc/rauc.hash
rename to buildroot/package/rauc/rauc.hash
diff --git a/software/package/rauc/rauc.mk b/buildroot/package/rauc/rauc.mk
similarity index 100%
rename from software/package/rauc/rauc.mk
rename to buildroot/package/rauc/rauc.mk
diff --git a/software/package/rcw/Config.in.host b/buildroot/package/rcw/Config.in.host
similarity index 100%
rename from software/package/rcw/Config.in.host
rename to buildroot/package/rcw/Config.in.host
diff --git a/software/package/rcw/rcw.hash b/buildroot/package/rcw/rcw.hash
similarity index 100%
rename from software/package/rcw/rcw.hash
rename to buildroot/package/rcw/rcw.hash
diff --git a/software/package/rcw/rcw.mk b/buildroot/package/rcw/rcw.mk
similarity index 100%
rename from software/package/rcw/rcw.mk
rename to buildroot/package/rcw/rcw.mk
diff --git a/software/package/rdesktop/0001-8bit-colors.patch b/buildroot/package/rdesktop/0001-8bit-colors.patch
similarity index 100%
rename from software/package/rdesktop/0001-8bit-colors.patch
rename to buildroot/package/rdesktop/0001-8bit-colors.patch
diff --git a/software/package/rdesktop/Config.in b/buildroot/package/rdesktop/Config.in
similarity index 100%
rename from software/package/rdesktop/Config.in
rename to buildroot/package/rdesktop/Config.in
diff --git a/software/package/rdesktop/rdesktop.hash b/buildroot/package/rdesktop/rdesktop.hash
similarity index 100%
rename from software/package/rdesktop/rdesktop.hash
rename to buildroot/package/rdesktop/rdesktop.hash
diff --git a/software/package/rdesktop/rdesktop.mk b/buildroot/package/rdesktop/rdesktop.mk
similarity index 100%
rename from software/package/rdesktop/rdesktop.mk
rename to buildroot/package/rdesktop/rdesktop.mk
diff --git a/software/package/read-edid/0001-Fix-install-file-list.patch b/buildroot/package/read-edid/0001-Fix-install-file-list.patch
similarity index 100%
rename from software/package/read-edid/0001-Fix-install-file-list.patch
rename to buildroot/package/read-edid/0001-Fix-install-file-list.patch
diff --git a/software/package/read-edid/0002-Fix-compiler-check.patch b/buildroot/package/read-edid/0002-Fix-compiler-check.patch
similarity index 100%
rename from software/package/read-edid/0002-Fix-compiler-check.patch
rename to buildroot/package/read-edid/0002-Fix-compiler-check.patch
diff --git a/software/package/read-edid/Config.in b/buildroot/package/read-edid/Config.in
similarity index 100%
rename from software/package/read-edid/Config.in
rename to buildroot/package/read-edid/Config.in
diff --git a/software/package/read-edid/read-edid.hash b/buildroot/package/read-edid/read-edid.hash
similarity index 100%
rename from software/package/read-edid/read-edid.hash
rename to buildroot/package/read-edid/read-edid.hash
diff --git a/software/package/read-edid/read-edid.mk b/buildroot/package/read-edid/read-edid.mk
similarity index 100%
rename from software/package/read-edid/read-edid.mk
rename to buildroot/package/read-edid/read-edid.mk
diff --git a/software/package/readline/0000-curses-link.patch b/buildroot/package/readline/0000-curses-link.patch
similarity index 100%
rename from software/package/readline/0000-curses-link.patch
rename to buildroot/package/readline/0000-curses-link.patch
diff --git a/software/package/readline/Config.in b/buildroot/package/readline/Config.in
similarity index 100%
rename from software/package/readline/Config.in
rename to buildroot/package/readline/Config.in
diff --git a/software/package/readline/inputrc b/buildroot/package/readline/inputrc
similarity index 100%
rename from software/package/readline/inputrc
rename to buildroot/package/readline/inputrc
diff --git a/software/package/readline/readline.hash b/buildroot/package/readline/readline.hash
similarity index 100%
rename from software/package/readline/readline.hash
rename to buildroot/package/readline/readline.hash
diff --git a/software/package/readline/readline.mk b/buildroot/package/readline/readline.mk
similarity index 100%
rename from software/package/readline/readline.mk
rename to buildroot/package/readline/readline.mk
diff --git a/software/package/reaver/0001-fix-271.patch b/buildroot/package/reaver/0001-fix-271.patch
similarity index 100%
rename from software/package/reaver/0001-fix-271.patch
rename to buildroot/package/reaver/0001-fix-271.patch
diff --git a/software/package/reaver/Config.in b/buildroot/package/reaver/Config.in
similarity index 100%
rename from software/package/reaver/Config.in
rename to buildroot/package/reaver/Config.in
diff --git a/software/package/reaver/reaver.hash b/buildroot/package/reaver/reaver.hash
similarity index 100%
rename from software/package/reaver/reaver.hash
rename to buildroot/package/reaver/reaver.hash
diff --git a/software/package/reaver/reaver.mk b/buildroot/package/reaver/reaver.mk
similarity index 100%
rename from software/package/reaver/reaver.mk
rename to buildroot/package/reaver/reaver.mk
diff --git a/software/package/redis/0001-uclibc.patch b/buildroot/package/redis/0001-uclibc.patch
similarity index 100%
rename from software/package/redis/0001-uclibc.patch
rename to buildroot/package/redis/0001-uclibc.patch
diff --git a/software/package/redis/0002-largefile-conditional-define.patch b/buildroot/package/redis/0002-largefile-conditional-define.patch
similarity index 100%
rename from software/package/redis/0002-largefile-conditional-define.patch
rename to buildroot/package/redis/0002-largefile-conditional-define.patch
diff --git a/software/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch b/buildroot/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch
similarity index 100%
rename from software/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch
rename to buildroot/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch
diff --git a/software/package/redis/Config.in b/buildroot/package/redis/Config.in
similarity index 100%
rename from software/package/redis/Config.in
rename to buildroot/package/redis/Config.in
diff --git a/software/package/redis/S50redis b/buildroot/package/redis/S50redis
similarity index 100%
rename from software/package/redis/S50redis
rename to buildroot/package/redis/S50redis
diff --git a/software/package/redis/redis.hash b/buildroot/package/redis/redis.hash
similarity index 100%
rename from software/package/redis/redis.hash
rename to buildroot/package/redis/redis.hash
diff --git a/software/package/redis/redis.mk b/buildroot/package/redis/redis.mk
similarity index 100%
rename from software/package/redis/redis.mk
rename to buildroot/package/redis/redis.mk
diff --git a/software/package/redis/redis.service b/buildroot/package/redis/redis.service
similarity index 100%
rename from software/package/redis/redis.service
rename to buildroot/package/redis/redis.service
diff --git a/software/package/refpolicy/Config.in b/buildroot/package/refpolicy/Config.in
similarity index 100%
rename from software/package/refpolicy/Config.in
rename to buildroot/package/refpolicy/Config.in
diff --git a/software/package/refpolicy/config b/buildroot/package/refpolicy/config
similarity index 100%
rename from software/package/refpolicy/config
rename to buildroot/package/refpolicy/config
diff --git a/software/package/refpolicy/refpolicy.hash b/buildroot/package/refpolicy/refpolicy.hash
similarity index 100%
rename from software/package/refpolicy/refpolicy.hash
rename to buildroot/package/refpolicy/refpolicy.hash
diff --git a/software/package/refpolicy/refpolicy.mk b/buildroot/package/refpolicy/refpolicy.mk
similarity index 100%
rename from software/package/refpolicy/refpolicy.mk
rename to buildroot/package/refpolicy/refpolicy.mk
diff --git a/software/package/restclient-cpp/Config.in b/buildroot/package/restclient-cpp/Config.in
similarity index 100%
rename from software/package/restclient-cpp/Config.in
rename to buildroot/package/restclient-cpp/Config.in
diff --git a/software/package/restclient-cpp/restclient-cpp.hash b/buildroot/package/restclient-cpp/restclient-cpp.hash
similarity index 100%
rename from software/package/restclient-cpp/restclient-cpp.hash
rename to buildroot/package/restclient-cpp/restclient-cpp.hash
diff --git a/software/package/restclient-cpp/restclient-cpp.mk b/buildroot/package/restclient-cpp/restclient-cpp.mk
similarity index 100%
rename from software/package/restclient-cpp/restclient-cpp.mk
rename to buildroot/package/restclient-cpp/restclient-cpp.mk
diff --git a/software/package/restorecond/Config.in b/buildroot/package/restorecond/Config.in
similarity index 100%
rename from software/package/restorecond/Config.in
rename to buildroot/package/restorecond/Config.in
diff --git a/software/package/restorecond/restorecond.hash b/buildroot/package/restorecond/restorecond.hash
similarity index 100%
rename from software/package/restorecond/restorecond.hash
rename to buildroot/package/restorecond/restorecond.hash
diff --git a/software/package/restorecond/restorecond.mk b/buildroot/package/restorecond/restorecond.mk
similarity index 100%
rename from software/package/restorecond/restorecond.mk
rename to buildroot/package/restorecond/restorecond.mk
diff --git a/software/package/rhash/Config.in b/buildroot/package/rhash/Config.in
similarity index 100%
rename from software/package/rhash/Config.in
rename to buildroot/package/rhash/Config.in
diff --git a/software/package/rhash/rhash.hash b/buildroot/package/rhash/rhash.hash
similarity index 100%
rename from software/package/rhash/rhash.hash
rename to buildroot/package/rhash/rhash.hash
diff --git a/software/package/rhash/rhash.mk b/buildroot/package/rhash/rhash.mk
similarity index 100%
rename from software/package/rhash/rhash.mk
rename to buildroot/package/rhash/rhash.mk
diff --git a/software/package/riemann-c-client/Config.in b/buildroot/package/riemann-c-client/Config.in
similarity index 100%
rename from software/package/riemann-c-client/Config.in
rename to buildroot/package/riemann-c-client/Config.in
diff --git a/software/package/riemann-c-client/riemann-c-client.hash b/buildroot/package/riemann-c-client/riemann-c-client.hash
similarity index 100%
rename from software/package/riemann-c-client/riemann-c-client.hash
rename to buildroot/package/riemann-c-client/riemann-c-client.hash
diff --git a/software/package/riemann-c-client/riemann-c-client.mk b/buildroot/package/riemann-c-client/riemann-c-client.mk
similarity index 100%
rename from software/package/riemann-c-client/riemann-c-client.mk
rename to buildroot/package/riemann-c-client/riemann-c-client.mk
diff --git a/software/package/rings/Config.in b/buildroot/package/rings/Config.in
similarity index 100%
rename from software/package/rings/Config.in
rename to buildroot/package/rings/Config.in
diff --git a/software/package/rings/rings.hash b/buildroot/package/rings/rings.hash
similarity index 100%
rename from software/package/rings/rings.hash
rename to buildroot/package/rings/rings.hash
diff --git a/software/package/rings/rings.mk b/buildroot/package/rings/rings.mk
similarity index 100%
rename from software/package/rings/rings.mk
rename to buildroot/package/rings/rings.mk
diff --git a/software/package/ripgrep/Config.in b/buildroot/package/ripgrep/Config.in
similarity index 100%
rename from software/package/ripgrep/Config.in
rename to buildroot/package/ripgrep/Config.in
diff --git a/software/package/ripgrep/ripgrep.hash b/buildroot/package/ripgrep/ripgrep.hash
similarity index 100%
rename from software/package/ripgrep/ripgrep.hash
rename to buildroot/package/ripgrep/ripgrep.hash
diff --git a/software/package/ripgrep/ripgrep.mk b/buildroot/package/ripgrep/ripgrep.mk
similarity index 100%
rename from software/package/ripgrep/ripgrep.mk
rename to buildroot/package/ripgrep/ripgrep.mk
diff --git a/software/package/rng-tools/Config.in b/buildroot/package/rng-tools/Config.in
similarity index 100%
rename from software/package/rng-tools/Config.in
rename to buildroot/package/rng-tools/Config.in
diff --git a/software/package/rng-tools/S21rngd b/buildroot/package/rng-tools/S21rngd
similarity index 100%
rename from software/package/rng-tools/S21rngd
rename to buildroot/package/rng-tools/S21rngd
diff --git a/software/package/rng-tools/rng-tools.hash b/buildroot/package/rng-tools/rng-tools.hash
similarity index 100%
rename from software/package/rng-tools/rng-tools.hash
rename to buildroot/package/rng-tools/rng-tools.hash
diff --git a/software/package/rng-tools/rng-tools.mk b/buildroot/package/rng-tools/rng-tools.mk
similarity index 100%
rename from software/package/rng-tools/rng-tools.mk
rename to buildroot/package/rng-tools/rng-tools.mk
diff --git a/software/package/rng-tools/rngd.service b/buildroot/package/rng-tools/rngd.service
similarity index 100%
rename from software/package/rng-tools/rngd.service
rename to buildroot/package/rng-tools/rngd.service
diff --git a/software/package/rocksdb/0001-Check-for-sys-auxv.h.patch b/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch
similarity index 100%
rename from software/package/rocksdb/0001-Check-for-sys-auxv.h.patch
rename to buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch
diff --git a/software/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch b/buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch
similarity index 100%
rename from software/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch
rename to buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch
diff --git a/software/package/rocksdb/Config.in b/buildroot/package/rocksdb/Config.in
similarity index 100%
rename from software/package/rocksdb/Config.in
rename to buildroot/package/rocksdb/Config.in
diff --git a/software/package/rocksdb/rocksdb.hash b/buildroot/package/rocksdb/rocksdb.hash
similarity index 100%
rename from software/package/rocksdb/rocksdb.hash
rename to buildroot/package/rocksdb/rocksdb.hash
diff --git a/software/package/rocksdb/rocksdb.mk b/buildroot/package/rocksdb/rocksdb.mk
similarity index 100%
rename from software/package/rocksdb/rocksdb.mk
rename to buildroot/package/rocksdb/rocksdb.mk
diff --git a/software/package/rp-pppoe/0002-krn-plugin.patch b/buildroot/package/rp-pppoe/0002-krn-plugin.patch
similarity index 100%
rename from software/package/rp-pppoe/0002-krn-plugin.patch
rename to buildroot/package/rp-pppoe/0002-krn-plugin.patch
diff --git a/software/package/rp-pppoe/Config.in b/buildroot/package/rp-pppoe/Config.in
similarity index 100%
rename from software/package/rp-pppoe/Config.in
rename to buildroot/package/rp-pppoe/Config.in
diff --git a/software/package/rp-pppoe/rp-pppoe.hash b/buildroot/package/rp-pppoe/rp-pppoe.hash
similarity index 100%
rename from software/package/rp-pppoe/rp-pppoe.hash
rename to buildroot/package/rp-pppoe/rp-pppoe.hash
diff --git a/software/package/rp-pppoe/rp-pppoe.mk b/buildroot/package/rp-pppoe/rp-pppoe.mk
similarity index 100%
rename from software/package/rp-pppoe/rp-pppoe.mk
rename to buildroot/package/rp-pppoe/rp-pppoe.mk
diff --git a/software/package/rpcbind/0001-Remove-yellow-pages-support.patch b/buildroot/package/rpcbind/0001-Remove-yellow-pages-support.patch
similarity index 100%
rename from software/package/rpcbind/0001-Remove-yellow-pages-support.patch
rename to buildroot/package/rpcbind/0001-Remove-yellow-pages-support.patch
diff --git a/software/package/rpcbind/Config.in b/buildroot/package/rpcbind/Config.in
similarity index 100%
rename from software/package/rpcbind/Config.in
rename to buildroot/package/rpcbind/Config.in
diff --git a/software/package/rpcbind/S30rpcbind b/buildroot/package/rpcbind/S30rpcbind
similarity index 100%
rename from software/package/rpcbind/S30rpcbind
rename to buildroot/package/rpcbind/S30rpcbind
diff --git a/software/package/rpcbind/rpcbind.hash b/buildroot/package/rpcbind/rpcbind.hash
similarity index 100%
rename from software/package/rpcbind/rpcbind.hash
rename to buildroot/package/rpcbind/rpcbind.hash
diff --git a/software/package/rpcbind/rpcbind.mk b/buildroot/package/rpcbind/rpcbind.mk
similarity index 100%
rename from software/package/rpcbind/rpcbind.mk
rename to buildroot/package/rpcbind/rpcbind.mk
diff --git a/software/package/rpcbind/rpcbind.service b/buildroot/package/rpcbind/rpcbind.service
similarity index 100%
rename from software/package/rpcbind/rpcbind.service
rename to buildroot/package/rpcbind/rpcbind.service
diff --git a/software/package/rpcbind/rpcbind.socket b/buildroot/package/rpcbind/rpcbind.socket
similarity index 100%
rename from software/package/rpcbind/rpcbind.socket
rename to buildroot/package/rpcbind/rpcbind.socket
diff --git a/software/package/rpi-bt-firmware/Config.in b/buildroot/package/rpi-bt-firmware/Config.in
similarity index 100%
rename from software/package/rpi-bt-firmware/Config.in
rename to buildroot/package/rpi-bt-firmware/Config.in
diff --git a/software/package/rpi-bt-firmware/rpi-bt-firmware.hash b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
similarity index 100%
rename from software/package/rpi-bt-firmware/rpi-bt-firmware.hash
rename to buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
diff --git a/software/package/rpi-bt-firmware/rpi-bt-firmware.mk b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
similarity index 100%
rename from software/package/rpi-bt-firmware/rpi-bt-firmware.mk
rename to buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
diff --git a/software/package/rpi-firmware/Config.in b/buildroot/package/rpi-firmware/Config.in
similarity index 100%
rename from software/package/rpi-firmware/Config.in
rename to buildroot/package/rpi-firmware/Config.in
diff --git a/software/package/rpi-firmware/cmdline.txt b/buildroot/package/rpi-firmware/cmdline.txt
similarity index 100%
rename from software/package/rpi-firmware/cmdline.txt
rename to buildroot/package/rpi-firmware/cmdline.txt
diff --git a/software/package/rpi-firmware/config.txt b/buildroot/package/rpi-firmware/config.txt
similarity index 100%
rename from software/package/rpi-firmware/config.txt
rename to buildroot/package/rpi-firmware/config.txt
diff --git a/software/package/rpi-firmware/rpi-firmware.hash b/buildroot/package/rpi-firmware/rpi-firmware.hash
similarity index 100%
rename from software/package/rpi-firmware/rpi-firmware.hash
rename to buildroot/package/rpi-firmware/rpi-firmware.hash
diff --git a/software/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk
similarity index 100%
rename from software/package/rpi-firmware/rpi-firmware.mk
rename to buildroot/package/rpi-firmware/rpi-firmware.mk
diff --git a/software/package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch b/buildroot/package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch
similarity index 100%
rename from software/package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch
rename to buildroot/package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch
diff --git a/software/package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch b/buildroot/package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch
similarity index 100%
rename from software/package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch
rename to buildroot/package/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch
diff --git a/software/package/rpi-userland/0003-Disable-Werror-everywhere.patch b/buildroot/package/rpi-userland/0003-Disable-Werror-everywhere.patch
similarity index 100%
rename from software/package/rpi-userland/0003-Disable-Werror-everywhere.patch
rename to buildroot/package/rpi-userland/0003-Disable-Werror-everywhere.patch
diff --git a/software/package/rpi-userland/0004-host-applications-disable-missing-applications.patch b/buildroot/package/rpi-userland/0004-host-applications-disable-missing-applications.patch
similarity index 100%
rename from software/package/rpi-userland/0004-host-applications-disable-missing-applications.patch
rename to buildroot/package/rpi-userland/0004-host-applications-disable-missing-applications.patch
diff --git a/software/package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch b/buildroot/package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch
similarity index 100%
rename from software/package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch
rename to buildroot/package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch
diff --git a/software/package/rpi-userland/Config.in b/buildroot/package/rpi-userland/Config.in
similarity index 100%
rename from software/package/rpi-userland/Config.in
rename to buildroot/package/rpi-userland/Config.in
diff --git a/software/package/rpi-userland/rpi-userland.hash b/buildroot/package/rpi-userland/rpi-userland.hash
similarity index 100%
rename from software/package/rpi-userland/rpi-userland.hash
rename to buildroot/package/rpi-userland/rpi-userland.hash
diff --git a/software/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk
similarity index 100%
rename from software/package/rpi-userland/rpi-userland.mk
rename to buildroot/package/rpi-userland/rpi-userland.mk
diff --git a/software/package/rpi-wifi-firmware/Config.in b/buildroot/package/rpi-wifi-firmware/Config.in
similarity index 100%
rename from software/package/rpi-wifi-firmware/Config.in
rename to buildroot/package/rpi-wifi-firmware/Config.in
diff --git a/software/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
similarity index 100%
rename from software/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
rename to buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
diff --git a/software/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
similarity index 100%
rename from software/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
rename to buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
diff --git a/software/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch b/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch
similarity index 100%
rename from software/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch
rename to buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch
diff --git a/software/package/rpm/Config.in b/buildroot/package/rpm/Config.in
similarity index 100%
rename from software/package/rpm/Config.in
rename to buildroot/package/rpm/Config.in
diff --git a/software/package/rpm/rpm.hash b/buildroot/package/rpm/rpm.hash
similarity index 100%
rename from software/package/rpm/rpm.hash
rename to buildroot/package/rpm/rpm.hash
diff --git a/software/package/rpm/rpm.mk b/buildroot/package/rpm/rpm.mk
similarity index 100%
rename from software/package/rpm/rpm.mk
rename to buildroot/package/rpm/rpm.mk
diff --git a/software/package/rrdtool/Config.in b/buildroot/package/rrdtool/Config.in
similarity index 100%
rename from software/package/rrdtool/Config.in
rename to buildroot/package/rrdtool/Config.in
diff --git a/software/package/rrdtool/rrdtool.hash b/buildroot/package/rrdtool/rrdtool.hash
similarity index 100%
rename from software/package/rrdtool/rrdtool.hash
rename to buildroot/package/rrdtool/rrdtool.hash
diff --git a/software/package/rrdtool/rrdtool.mk b/buildroot/package/rrdtool/rrdtool.mk
similarity index 100%
rename from software/package/rrdtool/rrdtool.mk
rename to buildroot/package/rrdtool/rrdtool.mk
diff --git a/software/package/rs485conf/Config.in b/buildroot/package/rs485conf/Config.in
similarity index 100%
rename from software/package/rs485conf/Config.in
rename to buildroot/package/rs485conf/Config.in
diff --git a/software/package/rs485conf/rs485conf.hash b/buildroot/package/rs485conf/rs485conf.hash
similarity index 100%
rename from software/package/rs485conf/rs485conf.hash
rename to buildroot/package/rs485conf/rs485conf.hash
diff --git a/software/package/rs485conf/rs485conf.mk b/buildroot/package/rs485conf/rs485conf.mk
similarity index 100%
rename from software/package/rs485conf/rs485conf.mk
rename to buildroot/package/rs485conf/rs485conf.mk
diff --git a/software/package/rsh-redone/Config.in b/buildroot/package/rsh-redone/Config.in
similarity index 100%
rename from software/package/rsh-redone/Config.in
rename to buildroot/package/rsh-redone/Config.in
diff --git a/software/package/rsh-redone/rsh-redone.hash b/buildroot/package/rsh-redone/rsh-redone.hash
similarity index 100%
rename from software/package/rsh-redone/rsh-redone.hash
rename to buildroot/package/rsh-redone/rsh-redone.hash
diff --git a/software/package/rsh-redone/rsh-redone.mk b/buildroot/package/rsh-redone/rsh-redone.mk
similarity index 100%
rename from software/package/rsh-redone/rsh-redone.mk
rename to buildroot/package/rsh-redone/rsh-redone.mk
diff --git a/software/package/rsync/Config.in b/buildroot/package/rsync/Config.in
similarity index 100%
rename from software/package/rsync/Config.in
rename to buildroot/package/rsync/Config.in
diff --git a/software/package/rsync/rsync.hash b/buildroot/package/rsync/rsync.hash
similarity index 100%
rename from software/package/rsync/rsync.hash
rename to buildroot/package/rsync/rsync.hash
diff --git a/software/package/rsync/rsync.mk b/buildroot/package/rsync/rsync.mk
similarity index 100%
rename from software/package/rsync/rsync.mk
rename to buildroot/package/rsync/rsync.mk
diff --git a/software/package/rsyslog/Config.in b/buildroot/package/rsyslog/Config.in
similarity index 100%
rename from software/package/rsyslog/Config.in
rename to buildroot/package/rsyslog/Config.in
diff --git a/software/package/rsyslog/S01rsyslogd b/buildroot/package/rsyslog/S01rsyslogd
similarity index 100%
rename from software/package/rsyslog/S01rsyslogd
rename to buildroot/package/rsyslog/S01rsyslogd
diff --git a/software/package/rsyslog/rsyslog.hash b/buildroot/package/rsyslog/rsyslog.hash
similarity index 100%
rename from software/package/rsyslog/rsyslog.hash
rename to buildroot/package/rsyslog/rsyslog.hash
diff --git a/software/package/rsyslog/rsyslog.mk b/buildroot/package/rsyslog/rsyslog.mk
similarity index 100%
rename from software/package/rsyslog/rsyslog.mk
rename to buildroot/package/rsyslog/rsyslog.mk
diff --git a/software/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch b/buildroot/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch
similarity index 100%
rename from software/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch
rename to buildroot/package/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch
diff --git a/software/package/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch b/buildroot/package/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch
similarity index 100%
rename from software/package/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch
rename to buildroot/package/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch
diff --git a/software/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch b/buildroot/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch
similarity index 100%
rename from software/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch
rename to buildroot/package/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch
diff --git a/software/package/rt-tests/Config.in b/buildroot/package/rt-tests/Config.in
similarity index 100%
rename from software/package/rt-tests/Config.in
rename to buildroot/package/rt-tests/Config.in
diff --git a/software/package/rt-tests/rt-tests.hash b/buildroot/package/rt-tests/rt-tests.hash
similarity index 100%
rename from software/package/rt-tests/rt-tests.hash
rename to buildroot/package/rt-tests/rt-tests.hash
diff --git a/software/package/rt-tests/rt-tests.mk b/buildroot/package/rt-tests/rt-tests.mk
similarity index 100%
rename from software/package/rt-tests/rt-tests.mk
rename to buildroot/package/rt-tests/rt-tests.mk
diff --git a/software/package/rtai/Config.in b/buildroot/package/rtai/Config.in
similarity index 100%
rename from software/package/rtai/Config.in
rename to buildroot/package/rtai/Config.in
diff --git a/software/package/rtai/rtai.hash b/buildroot/package/rtai/rtai.hash
similarity index 100%
rename from software/package/rtai/rtai.hash
rename to buildroot/package/rtai/rtai.hash
diff --git a/software/package/rtai/rtai.mk b/buildroot/package/rtai/rtai.mk
similarity index 100%
rename from software/package/rtai/rtai.mk
rename to buildroot/package/rtai/rtai.mk
diff --git a/software/package/rtc-tools/Config.in b/buildroot/package/rtc-tools/Config.in
similarity index 100%
rename from software/package/rtc-tools/Config.in
rename to buildroot/package/rtc-tools/Config.in
diff --git a/software/package/rtc-tools/rtc-tools.hash b/buildroot/package/rtc-tools/rtc-tools.hash
similarity index 100%
rename from software/package/rtc-tools/rtc-tools.hash
rename to buildroot/package/rtc-tools/rtc-tools.hash
diff --git a/software/package/rtc-tools/rtc-tools.mk b/buildroot/package/rtc-tools/rtc-tools.mk
similarity index 100%
rename from software/package/rtc-tools/rtc-tools.mk
rename to buildroot/package/rtc-tools/rtc-tools.mk
diff --git a/software/package/rtl8188eu/Config.in b/buildroot/package/rtl8188eu/Config.in
similarity index 100%
rename from software/package/rtl8188eu/Config.in
rename to buildroot/package/rtl8188eu/Config.in
diff --git a/software/package/rtl8188eu/rtl8188eu.hash b/buildroot/package/rtl8188eu/rtl8188eu.hash
similarity index 100%
rename from software/package/rtl8188eu/rtl8188eu.hash
rename to buildroot/package/rtl8188eu/rtl8188eu.hash
diff --git a/software/package/rtl8188eu/rtl8188eu.mk b/buildroot/package/rtl8188eu/rtl8188eu.mk
similarity index 100%
rename from software/package/rtl8188eu/rtl8188eu.mk
rename to buildroot/package/rtl8188eu/rtl8188eu.mk
diff --git a/software/package/rtl8189fs/Config.in b/buildroot/package/rtl8189fs/Config.in
similarity index 100%
rename from software/package/rtl8189fs/Config.in
rename to buildroot/package/rtl8189fs/Config.in
diff --git a/software/package/rtl8189fs/rtl8189fs.hash b/buildroot/package/rtl8189fs/rtl8189fs.hash
similarity index 100%
rename from software/package/rtl8189fs/rtl8189fs.hash
rename to buildroot/package/rtl8189fs/rtl8189fs.hash
diff --git a/software/package/rtl8189fs/rtl8189fs.mk b/buildroot/package/rtl8189fs/rtl8189fs.mk
similarity index 100%
rename from software/package/rtl8189fs/rtl8189fs.mk
rename to buildroot/package/rtl8189fs/rtl8189fs.mk
diff --git a/software/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch b/buildroot/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch
similarity index 100%
rename from software/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch
rename to buildroot/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch
diff --git a/software/package/rtl8723bs/Config.in b/buildroot/package/rtl8723bs/Config.in
similarity index 100%
rename from software/package/rtl8723bs/Config.in
rename to buildroot/package/rtl8723bs/Config.in
diff --git a/software/package/rtl8723bs/rtl8723bs.mk b/buildroot/package/rtl8723bs/rtl8723bs.mk
similarity index 100%
rename from software/package/rtl8723bs/rtl8723bs.mk
rename to buildroot/package/rtl8723bs/rtl8723bs.mk
diff --git a/software/package/rtl8723bu/Config.in b/buildroot/package/rtl8723bu/Config.in
similarity index 100%
rename from software/package/rtl8723bu/Config.in
rename to buildroot/package/rtl8723bu/Config.in
diff --git a/software/package/rtl8723bu/rtl8723bu.hash b/buildroot/package/rtl8723bu/rtl8723bu.hash
similarity index 100%
rename from software/package/rtl8723bu/rtl8723bu.hash
rename to buildroot/package/rtl8723bu/rtl8723bu.hash
diff --git a/software/package/rtl8723bu/rtl8723bu.mk b/buildroot/package/rtl8723bu/rtl8723bu.mk
similarity index 100%
rename from software/package/rtl8723bu/rtl8723bu.mk
rename to buildroot/package/rtl8723bu/rtl8723bu.mk
diff --git a/software/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch b/buildroot/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch
similarity index 100%
rename from software/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch
rename to buildroot/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch
diff --git a/software/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch b/buildroot/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch
similarity index 100%
rename from software/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch
rename to buildroot/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch
diff --git a/software/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch b/buildroot/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch
similarity index 100%
rename from software/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch
rename to buildroot/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch
diff --git a/software/package/rtl8821au/Config.in b/buildroot/package/rtl8821au/Config.in
similarity index 100%
rename from software/package/rtl8821au/Config.in
rename to buildroot/package/rtl8821au/Config.in
diff --git a/software/package/rtl8821au/rtl8821au.hash b/buildroot/package/rtl8821au/rtl8821au.hash
similarity index 100%
rename from software/package/rtl8821au/rtl8821au.hash
rename to buildroot/package/rtl8821au/rtl8821au.hash
diff --git a/software/package/rtl8821au/rtl8821au.mk b/buildroot/package/rtl8821au/rtl8821au.mk
similarity index 100%
rename from software/package/rtl8821au/rtl8821au.mk
rename to buildroot/package/rtl8821au/rtl8821au.mk
diff --git a/software/package/rtmpdump/0001-include-limits.h.patch b/buildroot/package/rtmpdump/0001-include-limits.h.patch
similarity index 100%
rename from software/package/rtmpdump/0001-include-limits.h.patch
rename to buildroot/package/rtmpdump/0001-include-limits.h.patch
diff --git a/software/package/rtmpdump/Config.in b/buildroot/package/rtmpdump/Config.in
similarity index 100%
rename from software/package/rtmpdump/Config.in
rename to buildroot/package/rtmpdump/Config.in
diff --git a/software/package/rtmpdump/rtmpdump.hash b/buildroot/package/rtmpdump/rtmpdump.hash
similarity index 100%
rename from software/package/rtmpdump/rtmpdump.hash
rename to buildroot/package/rtmpdump/rtmpdump.hash
diff --git a/software/package/rtmpdump/rtmpdump.mk b/buildroot/package/rtmpdump/rtmpdump.mk
similarity index 100%
rename from software/package/rtmpdump/rtmpdump.mk
rename to buildroot/package/rtmpdump/rtmpdump.mk
diff --git a/software/package/rtorrent/Config.in b/buildroot/package/rtorrent/Config.in
similarity index 100%
rename from software/package/rtorrent/Config.in
rename to buildroot/package/rtorrent/Config.in
diff --git a/software/package/rtorrent/rtorrent.hash b/buildroot/package/rtorrent/rtorrent.hash
similarity index 100%
rename from software/package/rtorrent/rtorrent.hash
rename to buildroot/package/rtorrent/rtorrent.hash
diff --git a/software/package/rtorrent/rtorrent.mk b/buildroot/package/rtorrent/rtorrent.mk
similarity index 100%
rename from software/package/rtorrent/rtorrent.mk
rename to buildroot/package/rtorrent/rtorrent.mk
diff --git a/software/package/rtptools/Config.in b/buildroot/package/rtptools/Config.in
similarity index 100%
rename from software/package/rtptools/Config.in
rename to buildroot/package/rtptools/Config.in
diff --git a/software/package/rtptools/rtptools.hash b/buildroot/package/rtptools/rtptools.hash
similarity index 100%
rename from software/package/rtptools/rtptools.hash
rename to buildroot/package/rtptools/rtptools.hash
diff --git a/software/package/rtptools/rtptools.mk b/buildroot/package/rtptools/rtptools.mk
similarity index 100%
rename from software/package/rtptools/rtptools.mk
rename to buildroot/package/rtptools/rtptools.mk
diff --git a/software/package/rubix/0001-dont-use-legacy-functions.patch b/buildroot/package/rubix/0001-dont-use-legacy-functions.patch
similarity index 100%
rename from software/package/rubix/0001-dont-use-legacy-functions.patch
rename to buildroot/package/rubix/0001-dont-use-legacy-functions.patch
diff --git a/software/package/rubix/0002-misc-fixes.patch b/buildroot/package/rubix/0002-misc-fixes.patch
similarity index 100%
rename from software/package/rubix/0002-misc-fixes.patch
rename to buildroot/package/rubix/0002-misc-fixes.patch
diff --git a/software/package/rubix/Config.in b/buildroot/package/rubix/Config.in
similarity index 100%
rename from software/package/rubix/Config.in
rename to buildroot/package/rubix/Config.in
diff --git a/software/package/rubix/rubix.hash b/buildroot/package/rubix/rubix.hash
similarity index 100%
rename from software/package/rubix/rubix.hash
rename to buildroot/package/rubix/rubix.hash
diff --git a/software/package/rubix/rubix.mk b/buildroot/package/rubix/rubix.mk
similarity index 100%
rename from software/package/rubix/rubix.mk
rename to buildroot/package/rubix/rubix.mk
diff --git a/software/package/ruby/Config.in b/buildroot/package/ruby/Config.in
similarity index 100%
rename from software/package/ruby/Config.in
rename to buildroot/package/ruby/Config.in
diff --git a/software/package/ruby/ruby.hash b/buildroot/package/ruby/ruby.hash
similarity index 100%
rename from software/package/ruby/ruby.hash
rename to buildroot/package/ruby/ruby.hash
diff --git a/software/package/ruby/ruby.mk b/buildroot/package/ruby/ruby.mk
similarity index 100%
rename from software/package/ruby/ruby.mk
rename to buildroot/package/ruby/ruby.mk
diff --git a/software/package/runc/Config.in b/buildroot/package/runc/Config.in
similarity index 100%
rename from software/package/runc/Config.in
rename to buildroot/package/runc/Config.in
diff --git a/software/package/runc/runc.hash b/buildroot/package/runc/runc.hash
similarity index 100%
rename from software/package/runc/runc.hash
rename to buildroot/package/runc/runc.hash
diff --git a/software/package/runc/runc.mk b/buildroot/package/runc/runc.mk
similarity index 100%
rename from software/package/runc/runc.mk
rename to buildroot/package/runc/runc.mk
diff --git a/software/package/rust-bin/rust-bin.hash b/buildroot/package/rust-bin/rust-bin.hash
similarity index 100%
rename from software/package/rust-bin/rust-bin.hash
rename to buildroot/package/rust-bin/rust-bin.hash
diff --git a/software/package/rust-bin/rust-bin.mk b/buildroot/package/rust-bin/rust-bin.mk
similarity index 100%
rename from software/package/rust-bin/rust-bin.mk
rename to buildroot/package/rust-bin/rust-bin.mk
diff --git a/software/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch b/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch
similarity index 100%
rename from software/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch
rename to buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch
diff --git a/software/package/rust/rust.hash b/buildroot/package/rust/rust.hash
similarity index 100%
rename from software/package/rust/rust.hash
rename to buildroot/package/rust/rust.hash
diff --git a/software/package/rust/rust.mk b/buildroot/package/rust/rust.mk
similarity index 100%
rename from software/package/rust/rust.mk
rename to buildroot/package/rust/rust.mk
diff --git a/software/package/rustc/Config.in.host b/buildroot/package/rustc/Config.in.host
similarity index 100%
rename from software/package/rustc/Config.in.host
rename to buildroot/package/rustc/Config.in.host
diff --git a/software/package/rustc/rustc.mk b/buildroot/package/rustc/rustc.mk
similarity index 100%
rename from software/package/rustc/rustc.mk
rename to buildroot/package/rustc/rustc.mk
diff --git a/software/package/rygel/Config.in b/buildroot/package/rygel/Config.in
similarity index 100%
rename from software/package/rygel/Config.in
rename to buildroot/package/rygel/Config.in
diff --git a/software/package/rygel/S99rygel b/buildroot/package/rygel/S99rygel
similarity index 100%
rename from software/package/rygel/S99rygel
rename to buildroot/package/rygel/S99rygel
diff --git a/software/package/rygel/rygel.hash b/buildroot/package/rygel/rygel.hash
similarity index 100%
rename from software/package/rygel/rygel.hash
rename to buildroot/package/rygel/rygel.hash
diff --git a/software/package/rygel/rygel.mk b/buildroot/package/rygel/rygel.mk
similarity index 100%
rename from software/package/rygel/rygel.mk
rename to buildroot/package/rygel/rygel.mk
diff --git a/software/package/rygel/rygel.service b/buildroot/package/rygel/rygel.service
similarity index 100%
rename from software/package/rygel/rygel.service
rename to buildroot/package/rygel/rygel.service
diff --git a/software/package/s6-dns/Config.in b/buildroot/package/s6-dns/Config.in
similarity index 100%
rename from software/package/s6-dns/Config.in
rename to buildroot/package/s6-dns/Config.in
diff --git a/software/package/s6-dns/s6-dns.hash b/buildroot/package/s6-dns/s6-dns.hash
similarity index 100%
rename from software/package/s6-dns/s6-dns.hash
rename to buildroot/package/s6-dns/s6-dns.hash
diff --git a/software/package/s6-dns/s6-dns.mk b/buildroot/package/s6-dns/s6-dns.mk
similarity index 100%
rename from software/package/s6-dns/s6-dns.mk
rename to buildroot/package/s6-dns/s6-dns.mk
diff --git a/software/package/s6-linux-init/Config.in b/buildroot/package/s6-linux-init/Config.in
similarity index 100%
rename from software/package/s6-linux-init/Config.in
rename to buildroot/package/s6-linux-init/Config.in
diff --git a/software/package/s6-linux-init/s6-linux-init.hash b/buildroot/package/s6-linux-init/s6-linux-init.hash
similarity index 100%
rename from software/package/s6-linux-init/s6-linux-init.hash
rename to buildroot/package/s6-linux-init/s6-linux-init.hash
diff --git a/software/package/s6-linux-init/s6-linux-init.mk b/buildroot/package/s6-linux-init/s6-linux-init.mk
similarity index 100%
rename from software/package/s6-linux-init/s6-linux-init.mk
rename to buildroot/package/s6-linux-init/s6-linux-init.mk
diff --git a/software/package/s6-linux-utils/Config.in b/buildroot/package/s6-linux-utils/Config.in
similarity index 100%
rename from software/package/s6-linux-utils/Config.in
rename to buildroot/package/s6-linux-utils/Config.in
diff --git a/software/package/s6-linux-utils/s6-linux-utils.hash b/buildroot/package/s6-linux-utils/s6-linux-utils.hash
similarity index 100%
rename from software/package/s6-linux-utils/s6-linux-utils.hash
rename to buildroot/package/s6-linux-utils/s6-linux-utils.hash
diff --git a/software/package/s6-linux-utils/s6-linux-utils.mk b/buildroot/package/s6-linux-utils/s6-linux-utils.mk
similarity index 100%
rename from software/package/s6-linux-utils/s6-linux-utils.mk
rename to buildroot/package/s6-linux-utils/s6-linux-utils.mk
diff --git a/software/package/s6-networking/Config.in b/buildroot/package/s6-networking/Config.in
similarity index 100%
rename from software/package/s6-networking/Config.in
rename to buildroot/package/s6-networking/Config.in
diff --git a/software/package/s6-networking/s6-networking.hash b/buildroot/package/s6-networking/s6-networking.hash
similarity index 100%
rename from software/package/s6-networking/s6-networking.hash
rename to buildroot/package/s6-networking/s6-networking.hash
diff --git a/software/package/s6-networking/s6-networking.mk b/buildroot/package/s6-networking/s6-networking.mk
similarity index 100%
rename from software/package/s6-networking/s6-networking.mk
rename to buildroot/package/s6-networking/s6-networking.mk
diff --git a/software/package/s6-portable-utils/Config.in b/buildroot/package/s6-portable-utils/Config.in
similarity index 100%
rename from software/package/s6-portable-utils/Config.in
rename to buildroot/package/s6-portable-utils/Config.in
diff --git a/software/package/s6-portable-utils/s6-portable-utils.hash b/buildroot/package/s6-portable-utils/s6-portable-utils.hash
similarity index 100%
rename from software/package/s6-portable-utils/s6-portable-utils.hash
rename to buildroot/package/s6-portable-utils/s6-portable-utils.hash
diff --git a/software/package/s6-portable-utils/s6-portable-utils.mk b/buildroot/package/s6-portable-utils/s6-portable-utils.mk
similarity index 100%
rename from software/package/s6-portable-utils/s6-portable-utils.mk
rename to buildroot/package/s6-portable-utils/s6-portable-utils.mk
diff --git a/software/package/s6-rc/Config.in b/buildroot/package/s6-rc/Config.in
similarity index 100%
rename from software/package/s6-rc/Config.in
rename to buildroot/package/s6-rc/Config.in
diff --git a/software/package/s6-rc/Config.in.host b/buildroot/package/s6-rc/Config.in.host
similarity index 100%
rename from software/package/s6-rc/Config.in.host
rename to buildroot/package/s6-rc/Config.in.host
diff --git a/software/package/s6-rc/s6-rc.hash b/buildroot/package/s6-rc/s6-rc.hash
similarity index 100%
rename from software/package/s6-rc/s6-rc.hash
rename to buildroot/package/s6-rc/s6-rc.hash
diff --git a/software/package/s6-rc/s6-rc.mk b/buildroot/package/s6-rc/s6-rc.mk
similarity index 100%
rename from software/package/s6-rc/s6-rc.mk
rename to buildroot/package/s6-rc/s6-rc.mk
diff --git a/software/package/s6/Config.in b/buildroot/package/s6/Config.in
similarity index 100%
rename from software/package/s6/Config.in
rename to buildroot/package/s6/Config.in
diff --git a/software/package/s6/s6.hash b/buildroot/package/s6/s6.hash
similarity index 100%
rename from software/package/s6/s6.hash
rename to buildroot/package/s6/s6.hash
diff --git a/software/package/s6/s6.mk b/buildroot/package/s6/s6.mk
similarity index 100%
rename from software/package/s6/s6.mk
rename to buildroot/package/s6/s6.mk
diff --git a/software/package/safeclib/Config.in b/buildroot/package/safeclib/Config.in
similarity index 100%
rename from software/package/safeclib/Config.in
rename to buildroot/package/safeclib/Config.in
diff --git a/software/package/safeclib/safeclib.hash b/buildroot/package/safeclib/safeclib.hash
similarity index 100%
rename from software/package/safeclib/safeclib.hash
rename to buildroot/package/safeclib/safeclib.hash
diff --git a/software/package/safeclib/safeclib.mk b/buildroot/package/safeclib/safeclib.mk
similarity index 100%
rename from software/package/safeclib/safeclib.mk
rename to buildroot/package/safeclib/safeclib.mk
diff --git a/software/package/sam-ba/Config.in.host b/buildroot/package/sam-ba/Config.in.host
similarity index 100%
rename from software/package/sam-ba/Config.in.host
rename to buildroot/package/sam-ba/Config.in.host
diff --git a/software/package/sam-ba/sam-ba.hash b/buildroot/package/sam-ba/sam-ba.hash
similarity index 100%
rename from software/package/sam-ba/sam-ba.hash
rename to buildroot/package/sam-ba/sam-ba.hash
diff --git a/software/package/sam-ba/sam-ba.mk b/buildroot/package/sam-ba/sam-ba.mk
similarity index 100%
rename from software/package/sam-ba/sam-ba.mk
rename to buildroot/package/sam-ba/sam-ba.mk
diff --git a/software/package/samba4/0001-libreplace-disable-libbsd-support.patch b/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch
similarity index 100%
rename from software/package/samba4/0001-libreplace-disable-libbsd-support.patch
rename to buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch
diff --git a/software/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/buildroot/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch
similarity index 100%
rename from software/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch
rename to buildroot/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch
diff --git a/software/package/samba4/0003-Fix-unistd.h-include.patch b/buildroot/package/samba4/0003-Fix-unistd.h-include.patch
similarity index 100%
rename from software/package/samba4/0003-Fix-unistd.h-include.patch
rename to buildroot/package/samba4/0003-Fix-unistd.h-include.patch
diff --git a/software/package/samba4/Config.in b/buildroot/package/samba4/Config.in
similarity index 100%
rename from software/package/samba4/Config.in
rename to buildroot/package/samba4/Config.in
diff --git a/software/package/samba4/S91smb b/buildroot/package/samba4/S91smb
similarity index 100%
rename from software/package/samba4/S91smb
rename to buildroot/package/samba4/S91smb
diff --git a/software/package/samba4/samba4-cache.txt b/buildroot/package/samba4/samba4-cache.txt
similarity index 100%
rename from software/package/samba4/samba4-cache.txt
rename to buildroot/package/samba4/samba4-cache.txt
diff --git a/software/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash
similarity index 100%
rename from software/package/samba4/samba4.hash
rename to buildroot/package/samba4/samba4.hash
diff --git a/software/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk
similarity index 100%
rename from software/package/samba4/samba4.mk
rename to buildroot/package/samba4/samba4.mk
diff --git a/software/package/sane-backends/0001-sane_backend-add-missing-config.h.patch b/buildroot/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
similarity index 100%
rename from software/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
rename to buildroot/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
diff --git a/software/package/sane-backends/Config.in b/buildroot/package/sane-backends/Config.in
similarity index 100%
rename from software/package/sane-backends/Config.in
rename to buildroot/package/sane-backends/Config.in
diff --git a/software/package/sane-backends/sane-backends.hash b/buildroot/package/sane-backends/sane-backends.hash
similarity index 100%
rename from software/package/sane-backends/sane-backends.hash
rename to buildroot/package/sane-backends/sane-backends.hash
diff --git a/software/package/sane-backends/sane-backends.mk b/buildroot/package/sane-backends/sane-backends.mk
similarity index 100%
rename from software/package/sane-backends/sane-backends.mk
rename to buildroot/package/sane-backends/sane-backends.mk
diff --git a/software/package/sane-backends/saned.socket b/buildroot/package/sane-backends/saned.socket
similarity index 100%
rename from software/package/sane-backends/saned.socket
rename to buildroot/package/sane-backends/saned.socket
diff --git a/software/package/sane-backends/saned@.service b/buildroot/package/sane-backends/saned@.service
similarity index 100%
rename from software/package/sane-backends/saned@.service
rename to buildroot/package/sane-backends/saned@.service
diff --git a/software/package/sbc/Config.in b/buildroot/package/sbc/Config.in
similarity index 100%
rename from software/package/sbc/Config.in
rename to buildroot/package/sbc/Config.in
diff --git a/software/package/sbc/sbc.hash b/buildroot/package/sbc/sbc.hash
similarity index 100%
rename from software/package/sbc/sbc.hash
rename to buildroot/package/sbc/sbc.hash
diff --git a/software/package/sbc/sbc.mk b/buildroot/package/sbc/sbc.mk
similarity index 100%
rename from software/package/sbc/sbc.mk
rename to buildroot/package/sbc/sbc.mk
diff --git a/software/package/sconeserver/Config.in b/buildroot/package/sconeserver/Config.in
similarity index 100%
rename from software/package/sconeserver/Config.in
rename to buildroot/package/sconeserver/Config.in
diff --git a/software/package/sconeserver/sconeserver.hash b/buildroot/package/sconeserver/sconeserver.hash
similarity index 100%
rename from software/package/sconeserver/sconeserver.hash
rename to buildroot/package/sconeserver/sconeserver.hash
diff --git a/software/package/sconeserver/sconeserver.mk b/buildroot/package/sconeserver/sconeserver.mk
similarity index 100%
rename from software/package/sconeserver/sconeserver.mk
rename to buildroot/package/sconeserver/sconeserver.mk
diff --git a/software/package/scons/scons.hash b/buildroot/package/scons/scons.hash
similarity index 100%
rename from software/package/scons/scons.hash
rename to buildroot/package/scons/scons.hash
diff --git a/software/package/scons/scons.mk b/buildroot/package/scons/scons.mk
similarity index 100%
rename from software/package/scons/scons.mk
rename to buildroot/package/scons/scons.mk
diff --git a/software/package/screen/0001-no-memcpy-fallback.patch b/buildroot/package/screen/0001-no-memcpy-fallback.patch
similarity index 100%
rename from software/package/screen/0001-no-memcpy-fallback.patch
rename to buildroot/package/screen/0001-no-memcpy-fallback.patch
diff --git a/software/package/screen/0002-install-no-backup-binary.patch b/buildroot/package/screen/0002-install-no-backup-binary.patch
similarity index 100%
rename from software/package/screen/0002-install-no-backup-binary.patch
rename to buildroot/package/screen/0002-install-no-backup-binary.patch
diff --git a/software/package/screen/0003-install-always-chmod.patch b/buildroot/package/screen/0003-install-always-chmod.patch
similarity index 100%
rename from software/package/screen/0003-install-always-chmod.patch
rename to buildroot/package/screen/0003-install-always-chmod.patch
diff --git a/software/package/screen/0004-install-nonversioned-binary.patch b/buildroot/package/screen/0004-install-nonversioned-binary.patch
similarity index 100%
rename from software/package/screen/0004-install-nonversioned-binary.patch
rename to buildroot/package/screen/0004-install-nonversioned-binary.patch
diff --git a/software/package/screen/0005-rename-sched_h.patch b/buildroot/package/screen/0005-rename-sched_h.patch
similarity index 100%
rename from software/package/screen/0005-rename-sched_h.patch
rename to buildroot/package/screen/0005-rename-sched_h.patch
diff --git a/software/package/screen/0006-comm-h-now-depends-on-term-h.patch b/buildroot/package/screen/0006-comm-h-now-depends-on-term-h.patch
similarity index 100%
rename from software/package/screen/0006-comm-h-now-depends-on-term-h.patch
rename to buildroot/package/screen/0006-comm-h-now-depends-on-term-h.patch
diff --git a/software/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch b/buildroot/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch
similarity index 100%
rename from software/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch
rename to buildroot/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch
diff --git a/software/package/screen/Config.in b/buildroot/package/screen/Config.in
similarity index 100%
rename from software/package/screen/Config.in
rename to buildroot/package/screen/Config.in
diff --git a/software/package/screen/screen.hash b/buildroot/package/screen/screen.hash
similarity index 100%
rename from software/package/screen/screen.hash
rename to buildroot/package/screen/screen.hash
diff --git a/software/package/screen/screen.mk b/buildroot/package/screen/screen.mk
similarity index 100%
rename from software/package/screen/screen.mk
rename to buildroot/package/screen/screen.mk
diff --git a/software/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch b/buildroot/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch
similarity index 100%
rename from software/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch
rename to buildroot/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch
diff --git a/software/package/scrub/Config.in b/buildroot/package/scrub/Config.in
similarity index 100%
rename from software/package/scrub/Config.in
rename to buildroot/package/scrub/Config.in
diff --git a/software/package/scrub/scrub.hash b/buildroot/package/scrub/scrub.hash
similarity index 100%
rename from software/package/scrub/scrub.hash
rename to buildroot/package/scrub/scrub.hash
diff --git a/software/package/scrub/scrub.mk b/buildroot/package/scrub/scrub.mk
similarity index 100%
rename from software/package/scrub/scrub.mk
rename to buildroot/package/scrub/scrub.mk
diff --git a/software/package/scrypt/Config.in b/buildroot/package/scrypt/Config.in
similarity index 100%
rename from software/package/scrypt/Config.in
rename to buildroot/package/scrypt/Config.in
diff --git a/software/package/scrypt/scrypt.hash b/buildroot/package/scrypt/scrypt.hash
similarity index 100%
rename from software/package/scrypt/scrypt.hash
rename to buildroot/package/scrypt/scrypt.hash
diff --git a/software/package/scrypt/scrypt.mk b/buildroot/package/scrypt/scrypt.mk
similarity index 100%
rename from software/package/scrypt/scrypt.mk
rename to buildroot/package/scrypt/scrypt.mk
diff --git a/software/package/sdbusplus/Config.in b/buildroot/package/sdbusplus/Config.in
similarity index 100%
rename from software/package/sdbusplus/Config.in
rename to buildroot/package/sdbusplus/Config.in
diff --git a/software/package/sdbusplus/Config.in.host b/buildroot/package/sdbusplus/Config.in.host
similarity index 100%
rename from software/package/sdbusplus/Config.in.host
rename to buildroot/package/sdbusplus/Config.in.host
diff --git a/software/package/sdbusplus/sdbusplus.hash b/buildroot/package/sdbusplus/sdbusplus.hash
similarity index 100%
rename from software/package/sdbusplus/sdbusplus.hash
rename to buildroot/package/sdbusplus/sdbusplus.hash
diff --git a/software/package/sdbusplus/sdbusplus.mk b/buildroot/package/sdbusplus/sdbusplus.mk
similarity index 100%
rename from software/package/sdbusplus/sdbusplus.mk
rename to buildroot/package/sdbusplus/sdbusplus.mk
diff --git a/software/package/sdl/0001-use-correct-directfb-config.patch b/buildroot/package/sdl/0001-use-correct-directfb-config.patch
similarity index 100%
rename from software/package/sdl/0001-use-correct-directfb-config.patch
rename to buildroot/package/sdl/0001-use-correct-directfb-config.patch
diff --git a/software/package/sdl/0002-fix-compilation-with-libx11.patch b/buildroot/package/sdl/0002-fix-compilation-with-libx11.patch
similarity index 100%
rename from software/package/sdl/0002-fix-compilation-with-libx11.patch
rename to buildroot/package/sdl/0002-fix-compilation-with-libx11.patch
diff --git a/software/package/sdl/Config.in b/buildroot/package/sdl/Config.in
similarity index 100%
rename from software/package/sdl/Config.in
rename to buildroot/package/sdl/Config.in
diff --git a/software/package/sdl/sdl.hash b/buildroot/package/sdl/sdl.hash
similarity index 100%
rename from software/package/sdl/sdl.hash
rename to buildroot/package/sdl/sdl.hash
diff --git a/software/package/sdl/sdl.mk b/buildroot/package/sdl/sdl.mk
similarity index 100%
rename from software/package/sdl/sdl.mk
rename to buildroot/package/sdl/sdl.mk
diff --git a/software/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch b/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch
similarity index 100%
rename from software/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch
rename to buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch
diff --git a/software/package/sdl2/0002-fix-busy-loop-in-dlopen.patch b/buildroot/package/sdl2/0002-fix-busy-loop-in-dlopen.patch
similarity index 100%
rename from software/package/sdl2/0002-fix-busy-loop-in-dlopen.patch
rename to buildroot/package/sdl2/0002-fix-busy-loop-in-dlopen.patch
diff --git a/software/package/sdl2/Config.in b/buildroot/package/sdl2/Config.in
similarity index 100%
rename from software/package/sdl2/Config.in
rename to buildroot/package/sdl2/Config.in
diff --git a/software/package/sdl2/sdl2.hash b/buildroot/package/sdl2/sdl2.hash
similarity index 100%
rename from software/package/sdl2/sdl2.hash
rename to buildroot/package/sdl2/sdl2.hash
diff --git a/software/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk
similarity index 100%
rename from software/package/sdl2/sdl2.mk
rename to buildroot/package/sdl2/sdl2.mk
diff --git a/software/package/sdl2_gfx/Config.in b/buildroot/package/sdl2_gfx/Config.in
similarity index 100%
rename from software/package/sdl2_gfx/Config.in
rename to buildroot/package/sdl2_gfx/Config.in
diff --git a/software/package/sdl2_gfx/sdl2_gfx.hash b/buildroot/package/sdl2_gfx/sdl2_gfx.hash
similarity index 100%
rename from software/package/sdl2_gfx/sdl2_gfx.hash
rename to buildroot/package/sdl2_gfx/sdl2_gfx.hash
diff --git a/software/package/sdl2_gfx/sdl2_gfx.mk b/buildroot/package/sdl2_gfx/sdl2_gfx.mk
similarity index 100%
rename from software/package/sdl2_gfx/sdl2_gfx.mk
rename to buildroot/package/sdl2_gfx/sdl2_gfx.mk
diff --git a/software/package/sdl2_image/Config.in b/buildroot/package/sdl2_image/Config.in
similarity index 100%
rename from software/package/sdl2_image/Config.in
rename to buildroot/package/sdl2_image/Config.in
diff --git a/software/package/sdl2_image/sdl2_image.hash b/buildroot/package/sdl2_image/sdl2_image.hash
similarity index 100%
rename from software/package/sdl2_image/sdl2_image.hash
rename to buildroot/package/sdl2_image/sdl2_image.hash
diff --git a/software/package/sdl2_image/sdl2_image.mk b/buildroot/package/sdl2_image/sdl2_image.mk
similarity index 100%
rename from software/package/sdl2_image/sdl2_image.mk
rename to buildroot/package/sdl2_image/sdl2_image.mk
diff --git a/software/package/sdl2_mixer/Config.in b/buildroot/package/sdl2_mixer/Config.in
similarity index 100%
rename from software/package/sdl2_mixer/Config.in
rename to buildroot/package/sdl2_mixer/Config.in
diff --git a/software/package/sdl2_mixer/sdl2_mixer.hash b/buildroot/package/sdl2_mixer/sdl2_mixer.hash
similarity index 100%
rename from software/package/sdl2_mixer/sdl2_mixer.hash
rename to buildroot/package/sdl2_mixer/sdl2_mixer.hash
diff --git a/software/package/sdl2_mixer/sdl2_mixer.mk b/buildroot/package/sdl2_mixer/sdl2_mixer.mk
similarity index 100%
rename from software/package/sdl2_mixer/sdl2_mixer.mk
rename to buildroot/package/sdl2_mixer/sdl2_mixer.mk
diff --git a/software/package/sdl2_net/Config.in b/buildroot/package/sdl2_net/Config.in
similarity index 100%
rename from software/package/sdl2_net/Config.in
rename to buildroot/package/sdl2_net/Config.in
diff --git a/software/package/sdl2_net/sdl2_net.hash b/buildroot/package/sdl2_net/sdl2_net.hash
similarity index 100%
rename from software/package/sdl2_net/sdl2_net.hash
rename to buildroot/package/sdl2_net/sdl2_net.hash
diff --git a/software/package/sdl2_net/sdl2_net.mk b/buildroot/package/sdl2_net/sdl2_net.mk
similarity index 100%
rename from software/package/sdl2_net/sdl2_net.mk
rename to buildroot/package/sdl2_net/sdl2_net.mk
diff --git a/software/package/sdl2_ttf/Config.in b/buildroot/package/sdl2_ttf/Config.in
similarity index 100%
rename from software/package/sdl2_ttf/Config.in
rename to buildroot/package/sdl2_ttf/Config.in
diff --git a/software/package/sdl2_ttf/sdl2_ttf.hash b/buildroot/package/sdl2_ttf/sdl2_ttf.hash
similarity index 100%
rename from software/package/sdl2_ttf/sdl2_ttf.hash
rename to buildroot/package/sdl2_ttf/sdl2_ttf.hash
diff --git a/software/package/sdl2_ttf/sdl2_ttf.mk b/buildroot/package/sdl2_ttf/sdl2_ttf.mk
similarity index 100%
rename from software/package/sdl2_ttf/sdl2_ttf.mk
rename to buildroot/package/sdl2_ttf/sdl2_ttf.mk
diff --git a/software/package/sdl_gfx/Config.in b/buildroot/package/sdl_gfx/Config.in
similarity index 100%
rename from software/package/sdl_gfx/Config.in
rename to buildroot/package/sdl_gfx/Config.in
diff --git a/software/package/sdl_gfx/sdl_gfx.hash b/buildroot/package/sdl_gfx/sdl_gfx.hash
similarity index 100%
rename from software/package/sdl_gfx/sdl_gfx.hash
rename to buildroot/package/sdl_gfx/sdl_gfx.hash
diff --git a/software/package/sdl_gfx/sdl_gfx.mk b/buildroot/package/sdl_gfx/sdl_gfx.mk
similarity index 100%
rename from software/package/sdl_gfx/sdl_gfx.mk
rename to buildroot/package/sdl_gfx/sdl_gfx.mk
diff --git a/software/package/sdl_image/Config.in b/buildroot/package/sdl_image/Config.in
similarity index 100%
rename from software/package/sdl_image/Config.in
rename to buildroot/package/sdl_image/Config.in
diff --git a/software/package/sdl_image/sdl_image.hash b/buildroot/package/sdl_image/sdl_image.hash
similarity index 100%
rename from software/package/sdl_image/sdl_image.hash
rename to buildroot/package/sdl_image/sdl_image.hash
diff --git a/software/package/sdl_image/sdl_image.mk b/buildroot/package/sdl_image/sdl_image.mk
similarity index 100%
rename from software/package/sdl_image/sdl_image.mk
rename to buildroot/package/sdl_image/sdl_image.mk
diff --git a/software/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch b/buildroot/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
similarity index 100%
rename from software/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
rename to buildroot/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
diff --git a/software/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch b/buildroot/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch
similarity index 100%
rename from software/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch
rename to buildroot/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch
diff --git a/software/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch b/buildroot/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
similarity index 100%
rename from software/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
rename to buildroot/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
diff --git a/software/package/sdl_mixer/0004-configure__set_macro_directory.patch b/buildroot/package/sdl_mixer/0004-configure__set_macro_directory.patch
similarity index 100%
rename from software/package/sdl_mixer/0004-configure__set_macro_directory.patch
rename to buildroot/package/sdl_mixer/0004-configure__set_macro_directory.patch
diff --git a/software/package/sdl_mixer/Config.in b/buildroot/package/sdl_mixer/Config.in
similarity index 100%
rename from software/package/sdl_mixer/Config.in
rename to buildroot/package/sdl_mixer/Config.in
diff --git a/software/package/sdl_mixer/sdl_mixer.hash b/buildroot/package/sdl_mixer/sdl_mixer.hash
similarity index 100%
rename from software/package/sdl_mixer/sdl_mixer.hash
rename to buildroot/package/sdl_mixer/sdl_mixer.hash
diff --git a/software/package/sdl_mixer/sdl_mixer.mk b/buildroot/package/sdl_mixer/sdl_mixer.mk
similarity index 100%
rename from software/package/sdl_mixer/sdl_mixer.mk
rename to buildroot/package/sdl_mixer/sdl_mixer.mk
diff --git a/software/package/sdl_net/Config.in b/buildroot/package/sdl_net/Config.in
similarity index 100%
rename from software/package/sdl_net/Config.in
rename to buildroot/package/sdl_net/Config.in
diff --git a/software/package/sdl_net/sdl_net.hash b/buildroot/package/sdl_net/sdl_net.hash
similarity index 100%
rename from software/package/sdl_net/sdl_net.hash
rename to buildroot/package/sdl_net/sdl_net.hash
diff --git a/software/package/sdl_net/sdl_net.mk b/buildroot/package/sdl_net/sdl_net.mk
similarity index 100%
rename from software/package/sdl_net/sdl_net.mk
rename to buildroot/package/sdl_net/sdl_net.mk
diff --git a/software/package/sdl_sound/0001-fix-constness.patch b/buildroot/package/sdl_sound/0001-fix-constness.patch
similarity index 100%
rename from software/package/sdl_sound/0001-fix-constness.patch
rename to buildroot/package/sdl_sound/0001-fix-constness.patch
diff --git a/software/package/sdl_sound/0002-remove-werror.patch b/buildroot/package/sdl_sound/0002-remove-werror.patch
similarity index 100%
rename from software/package/sdl_sound/0002-remove-werror.patch
rename to buildroot/package/sdl_sound/0002-remove-werror.patch
diff --git a/software/package/sdl_sound/0003-renamed-physfs-export.patch b/buildroot/package/sdl_sound/0003-renamed-physfs-export.patch
similarity index 100%
rename from software/package/sdl_sound/0003-renamed-physfs-export.patch
rename to buildroot/package/sdl_sound/0003-renamed-physfs-export.patch
diff --git a/software/package/sdl_sound/Config.in b/buildroot/package/sdl_sound/Config.in
similarity index 100%
rename from software/package/sdl_sound/Config.in
rename to buildroot/package/sdl_sound/Config.in
diff --git a/software/package/sdl_sound/sdl_sound.hash b/buildroot/package/sdl_sound/sdl_sound.hash
similarity index 100%
rename from software/package/sdl_sound/sdl_sound.hash
rename to buildroot/package/sdl_sound/sdl_sound.hash
diff --git a/software/package/sdl_sound/sdl_sound.mk b/buildroot/package/sdl_sound/sdl_sound.mk
similarity index 100%
rename from software/package/sdl_sound/sdl_sound.mk
rename to buildroot/package/sdl_sound/sdl_sound.mk
diff --git a/software/package/sdl_ttf/Config.in b/buildroot/package/sdl_ttf/Config.in
similarity index 100%
rename from software/package/sdl_ttf/Config.in
rename to buildroot/package/sdl_ttf/Config.in
diff --git a/software/package/sdl_ttf/sdl_ttf.hash b/buildroot/package/sdl_ttf/sdl_ttf.hash
similarity index 100%
rename from software/package/sdl_ttf/sdl_ttf.hash
rename to buildroot/package/sdl_ttf/sdl_ttf.hash
diff --git a/software/package/sdl_ttf/sdl_ttf.mk b/buildroot/package/sdl_ttf/sdl_ttf.mk
similarity index 100%
rename from software/package/sdl_ttf/sdl_ttf.mk
rename to buildroot/package/sdl_ttf/sdl_ttf.mk
diff --git a/software/package/sdparm/Config.in b/buildroot/package/sdparm/Config.in
similarity index 100%
rename from software/package/sdparm/Config.in
rename to buildroot/package/sdparm/Config.in
diff --git a/software/package/sdparm/sdparm.hash b/buildroot/package/sdparm/sdparm.hash
similarity index 100%
rename from software/package/sdparm/sdparm.hash
rename to buildroot/package/sdparm/sdparm.hash
diff --git a/software/package/sdparm/sdparm.mk b/buildroot/package/sdparm/sdparm.mk
similarity index 100%
rename from software/package/sdparm/sdparm.mk
rename to buildroot/package/sdparm/sdparm.mk
diff --git a/software/package/sed/Config.in b/buildroot/package/sed/Config.in
similarity index 100%
rename from software/package/sed/Config.in
rename to buildroot/package/sed/Config.in
diff --git a/software/package/sed/sed.hash b/buildroot/package/sed/sed.hash
similarity index 100%
rename from software/package/sed/sed.hash
rename to buildroot/package/sed/sed.hash
diff --git a/software/package/sed/sed.mk b/buildroot/package/sed/sed.mk
similarity index 100%
rename from software/package/sed/sed.mk
rename to buildroot/package/sed/sed.mk
diff --git a/software/package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch b/buildroot/package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch
similarity index 100%
rename from software/package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch
rename to buildroot/package/sedutil/0001-Common-log.h-time-2-needs-time.h.patch
diff --git a/software/package/sedutil/Config.in b/buildroot/package/sedutil/Config.in
similarity index 100%
rename from software/package/sedutil/Config.in
rename to buildroot/package/sedutil/Config.in
diff --git a/software/package/sedutil/sedutil.hash b/buildroot/package/sedutil/sedutil.hash
similarity index 100%
rename from software/package/sedutil/sedutil.hash
rename to buildroot/package/sedutil/sedutil.hash
diff --git a/software/package/sedutil/sedutil.mk b/buildroot/package/sedutil/sedutil.mk
similarity index 100%
rename from software/package/sedutil/sedutil.mk
rename to buildroot/package/sedutil/sedutil.mk
diff --git a/software/package/selinux-python/Config.in b/buildroot/package/selinux-python/Config.in
similarity index 100%
rename from software/package/selinux-python/Config.in
rename to buildroot/package/selinux-python/Config.in
diff --git a/software/package/selinux-python/selinux-python.hash b/buildroot/package/selinux-python/selinux-python.hash
similarity index 100%
rename from software/package/selinux-python/selinux-python.hash
rename to buildroot/package/selinux-python/selinux-python.hash
diff --git a/software/package/selinux-python/selinux-python.mk b/buildroot/package/selinux-python/selinux-python.mk
similarity index 100%
rename from software/package/selinux-python/selinux-python.mk
rename to buildroot/package/selinux-python/selinux-python.mk
diff --git a/software/package/semodule-utils/Config.in b/buildroot/package/semodule-utils/Config.in
similarity index 100%
rename from software/package/semodule-utils/Config.in
rename to buildroot/package/semodule-utils/Config.in
diff --git a/software/package/semodule-utils/semodule-utils.hash b/buildroot/package/semodule-utils/semodule-utils.hash
similarity index 100%
rename from software/package/semodule-utils/semodule-utils.hash
rename to buildroot/package/semodule-utils/semodule-utils.hash
diff --git a/software/package/semodule-utils/semodule-utils.mk b/buildroot/package/semodule-utils/semodule-utils.mk
similarity index 100%
rename from software/package/semodule-utils/semodule-utils.mk
rename to buildroot/package/semodule-utils/semodule-utils.mk
diff --git a/software/package/ser2net/Config.in b/buildroot/package/ser2net/Config.in
similarity index 100%
rename from software/package/ser2net/Config.in
rename to buildroot/package/ser2net/Config.in
diff --git a/software/package/ser2net/S50ser2net b/buildroot/package/ser2net/S50ser2net
similarity index 100%
rename from software/package/ser2net/S50ser2net
rename to buildroot/package/ser2net/S50ser2net
diff --git a/software/package/ser2net/ser2net.hash b/buildroot/package/ser2net/ser2net.hash
similarity index 100%
rename from software/package/ser2net/ser2net.hash
rename to buildroot/package/ser2net/ser2net.hash
diff --git a/software/package/ser2net/ser2net.mk b/buildroot/package/ser2net/ser2net.mk
similarity index 100%
rename from software/package/ser2net/ser2net.mk
rename to buildroot/package/ser2net/ser2net.mk
diff --git a/software/package/setools/0001-remove-werror-flag-from-setup.patch b/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch
similarity index 100%
rename from software/package/setools/0001-remove-werror-flag-from-setup.patch
rename to buildroot/package/setools/0001-remove-werror-flag-from-setup.patch
diff --git a/software/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
similarity index 100%
rename from software/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
rename to buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
diff --git a/software/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch b/buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
similarity index 100%
rename from software/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
rename to buildroot/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
diff --git a/software/package/setools/Config.in b/buildroot/package/setools/Config.in
similarity index 100%
rename from software/package/setools/Config.in
rename to buildroot/package/setools/Config.in
diff --git a/software/package/setools/setools.hash b/buildroot/package/setools/setools.hash
similarity index 100%
rename from software/package/setools/setools.hash
rename to buildroot/package/setools/setools.hash
diff --git a/software/package/setools/setools.mk b/buildroot/package/setools/setools.mk
similarity index 100%
rename from software/package/setools/setools.mk
rename to buildroot/package/setools/setools.mk
diff --git a/software/package/setserial/0001-build-system-fix.patch b/buildroot/package/setserial/0001-build-system-fix.patch
similarity index 100%
rename from software/package/setserial/0001-build-system-fix.patch
rename to buildroot/package/setserial/0001-build-system-fix.patch
diff --git a/software/package/setserial/0002-tiocghayesesp-build-fix.patch b/buildroot/package/setserial/0002-tiocghayesesp-build-fix.patch
similarity index 100%
rename from software/package/setserial/0002-tiocghayesesp-build-fix.patch
rename to buildroot/package/setserial/0002-tiocghayesesp-build-fix.patch
diff --git a/software/package/setserial/Config.in b/buildroot/package/setserial/Config.in
similarity index 100%
rename from software/package/setserial/Config.in
rename to buildroot/package/setserial/Config.in
diff --git a/software/package/setserial/setserial.hash b/buildroot/package/setserial/setserial.hash
similarity index 100%
rename from software/package/setserial/setserial.hash
rename to buildroot/package/setserial/setserial.hash
diff --git a/software/package/setserial/setserial.mk b/buildroot/package/setserial/setserial.mk
similarity index 100%
rename from software/package/setserial/setserial.mk
rename to buildroot/package/setserial/setserial.mk
diff --git a/software/package/sg3_utils/0001-support-uclinux-as-a-linux.patch b/buildroot/package/sg3_utils/0001-support-uclinux-as-a-linux.patch
similarity index 100%
rename from software/package/sg3_utils/0001-support-uclinux-as-a-linux.patch
rename to buildroot/package/sg3_utils/0001-support-uclinux-as-a-linux.patch
diff --git a/software/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch b/buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
similarity index 100%
rename from software/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
rename to buildroot/package/sg3_utils/0002-src-Makefile.am-add-missing-RT_LIB-for-sg_turs.patch
diff --git a/software/package/sg3_utils/Config.in b/buildroot/package/sg3_utils/Config.in
similarity index 100%
rename from software/package/sg3_utils/Config.in
rename to buildroot/package/sg3_utils/Config.in
diff --git a/software/package/sg3_utils/sg3_utils.hash b/buildroot/package/sg3_utils/sg3_utils.hash
similarity index 100%
rename from software/package/sg3_utils/sg3_utils.hash
rename to buildroot/package/sg3_utils/sg3_utils.hash
diff --git a/software/package/sg3_utils/sg3_utils.mk b/buildroot/package/sg3_utils/sg3_utils.mk
similarity index 100%
rename from software/package/sg3_utils/sg3_utils.mk
rename to buildroot/package/sg3_utils/sg3_utils.mk
diff --git a/software/package/shadowsocks-libev/Config.in b/buildroot/package/shadowsocks-libev/Config.in
similarity index 100%
rename from software/package/shadowsocks-libev/Config.in
rename to buildroot/package/shadowsocks-libev/Config.in
diff --git a/software/package/shadowsocks-libev/shadowsocks-libev.hash b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
similarity index 100%
rename from software/package/shadowsocks-libev/shadowsocks-libev.hash
rename to buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
diff --git a/software/package/shadowsocks-libev/shadowsocks-libev.mk b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
similarity index 100%
rename from software/package/shadowsocks-libev/shadowsocks-libev.mk
rename to buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
diff --git a/software/package/shairport-sync/Config.in b/buildroot/package/shairport-sync/Config.in
similarity index 100%
rename from software/package/shairport-sync/Config.in
rename to buildroot/package/shairport-sync/Config.in
diff --git a/software/package/shairport-sync/S99shairport-sync b/buildroot/package/shairport-sync/S99shairport-sync
similarity index 100%
rename from software/package/shairport-sync/S99shairport-sync
rename to buildroot/package/shairport-sync/S99shairport-sync
diff --git a/software/package/shairport-sync/shairport-sync.hash b/buildroot/package/shairport-sync/shairport-sync.hash
similarity index 100%
rename from software/package/shairport-sync/shairport-sync.hash
rename to buildroot/package/shairport-sync/shairport-sync.hash
diff --git a/software/package/shairport-sync/shairport-sync.mk b/buildroot/package/shairport-sync/shairport-sync.mk
similarity index 100%
rename from software/package/shairport-sync/shairport-sync.mk
rename to buildroot/package/shairport-sync/shairport-sync.mk
diff --git a/software/package/shapelib/Config.in b/buildroot/package/shapelib/Config.in
similarity index 100%
rename from software/package/shapelib/Config.in
rename to buildroot/package/shapelib/Config.in
diff --git a/software/package/shapelib/shapelib.hash b/buildroot/package/shapelib/shapelib.hash
similarity index 100%
rename from software/package/shapelib/shapelib.hash
rename to buildroot/package/shapelib/shapelib.hash
diff --git a/software/package/shapelib/shapelib.mk b/buildroot/package/shapelib/shapelib.mk
similarity index 100%
rename from software/package/shapelib/shapelib.mk
rename to buildroot/package/shapelib/shapelib.mk
diff --git a/software/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch b/buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch
similarity index 100%
rename from software/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch
rename to buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch
diff --git a/software/package/shared-mime-info/Config.in b/buildroot/package/shared-mime-info/Config.in
similarity index 100%
rename from software/package/shared-mime-info/Config.in
rename to buildroot/package/shared-mime-info/Config.in
diff --git a/software/package/shared-mime-info/shared-mime-info.hash b/buildroot/package/shared-mime-info/shared-mime-info.hash
similarity index 100%
rename from software/package/shared-mime-info/shared-mime-info.hash
rename to buildroot/package/shared-mime-info/shared-mime-info.hash
diff --git a/software/package/shared-mime-info/shared-mime-info.mk b/buildroot/package/shared-mime-info/shared-mime-info.mk
similarity index 100%
rename from software/package/shared-mime-info/shared-mime-info.mk
rename to buildroot/package/shared-mime-info/shared-mime-info.mk
diff --git a/software/package/shellinabox/0001-Makefile-disable-always-building-statically.patch b/buildroot/package/shellinabox/0001-Makefile-disable-always-building-statically.patch
similarity index 100%
rename from software/package/shellinabox/0001-Makefile-disable-always-building-statically.patch
rename to buildroot/package/shellinabox/0001-Makefile-disable-always-building-statically.patch
diff --git a/software/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch b/buildroot/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch
similarity index 100%
rename from software/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch
rename to buildroot/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch
diff --git a/software/package/shellinabox/Config.in b/buildroot/package/shellinabox/Config.in
similarity index 100%
rename from software/package/shellinabox/Config.in
rename to buildroot/package/shellinabox/Config.in
diff --git a/software/package/shellinabox/shellinabox.hash b/buildroot/package/shellinabox/shellinabox.hash
similarity index 100%
rename from software/package/shellinabox/shellinabox.hash
rename to buildroot/package/shellinabox/shellinabox.hash
diff --git a/software/package/shellinabox/shellinabox.mk b/buildroot/package/shellinabox/shellinabox.mk
similarity index 100%
rename from software/package/shellinabox/shellinabox.mk
rename to buildroot/package/shellinabox/shellinabox.mk
diff --git a/software/package/sigrok-cli/Config.in b/buildroot/package/sigrok-cli/Config.in
similarity index 100%
rename from software/package/sigrok-cli/Config.in
rename to buildroot/package/sigrok-cli/Config.in
diff --git a/software/package/sigrok-cli/sigrok-cli.hash b/buildroot/package/sigrok-cli/sigrok-cli.hash
similarity index 100%
rename from software/package/sigrok-cli/sigrok-cli.hash
rename to buildroot/package/sigrok-cli/sigrok-cli.hash
diff --git a/software/package/sigrok-cli/sigrok-cli.mk b/buildroot/package/sigrok-cli/sigrok-cli.mk
similarity index 100%
rename from software/package/sigrok-cli/sigrok-cli.mk
rename to buildroot/package/sigrok-cli/sigrok-cli.mk
diff --git a/software/package/sispmctl/Config.in b/buildroot/package/sispmctl/Config.in
similarity index 100%
rename from software/package/sispmctl/Config.in
rename to buildroot/package/sispmctl/Config.in
diff --git a/software/package/sispmctl/sispmctl.hash b/buildroot/package/sispmctl/sispmctl.hash
similarity index 100%
rename from software/package/sispmctl/sispmctl.hash
rename to buildroot/package/sispmctl/sispmctl.hash
diff --git a/software/package/sispmctl/sispmctl.mk b/buildroot/package/sispmctl/sispmctl.mk
similarity index 100%
rename from software/package/sispmctl/sispmctl.mk
rename to buildroot/package/sispmctl/sispmctl.mk
diff --git a/software/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch b/buildroot/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch
similarity index 100%
rename from software/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch
rename to buildroot/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch
diff --git a/software/package/skalibs/Config.in b/buildroot/package/skalibs/Config.in
similarity index 100%
rename from software/package/skalibs/Config.in
rename to buildroot/package/skalibs/Config.in
diff --git a/software/package/skalibs/skalibs.hash b/buildroot/package/skalibs/skalibs.hash
similarity index 100%
rename from software/package/skalibs/skalibs.hash
rename to buildroot/package/skalibs/skalibs.hash
diff --git a/software/package/skalibs/skalibs.mk b/buildroot/package/skalibs/skalibs.mk
similarity index 100%
rename from software/package/skalibs/skalibs.mk
rename to buildroot/package/skalibs/skalibs.mk
diff --git a/software/package/skeleton-custom/Config.in b/buildroot/package/skeleton-custom/Config.in
similarity index 100%
rename from software/package/skeleton-custom/Config.in
rename to buildroot/package/skeleton-custom/Config.in
diff --git a/software/package/skeleton-custom/skeleton-custom.mk b/buildroot/package/skeleton-custom/skeleton-custom.mk
similarity index 100%
rename from software/package/skeleton-custom/skeleton-custom.mk
rename to buildroot/package/skeleton-custom/skeleton-custom.mk
diff --git a/software/package/skeleton-init-common/Config.in b/buildroot/package/skeleton-init-common/Config.in
similarity index 100%
rename from software/package/skeleton-init-common/Config.in
rename to buildroot/package/skeleton-init-common/Config.in
diff --git a/software/package/skeleton-init-common/skeleton-init-common.mk b/buildroot/package/skeleton-init-common/skeleton-init-common.mk
similarity index 100%
rename from software/package/skeleton-init-common/skeleton-init-common.mk
rename to buildroot/package/skeleton-init-common/skeleton-init-common.mk
diff --git a/software/package/skeleton-init-none/Config.in b/buildroot/package/skeleton-init-none/Config.in
similarity index 100%
rename from software/package/skeleton-init-none/Config.in
rename to buildroot/package/skeleton-init-none/Config.in
diff --git a/software/package/skeleton-init-none/skeleton-init-none.mk b/buildroot/package/skeleton-init-none/skeleton-init-none.mk
similarity index 100%
rename from software/package/skeleton-init-none/skeleton-init-none.mk
rename to buildroot/package/skeleton-init-none/skeleton-init-none.mk
diff --git a/software/package/skeleton-init-openrc/Config.in b/buildroot/package/skeleton-init-openrc/Config.in
similarity index 100%
rename from software/package/skeleton-init-openrc/Config.in
rename to buildroot/package/skeleton-init-openrc/Config.in
diff --git a/software/package/skeleton-init-openrc/skeleton-init-openrc.mk b/buildroot/package/skeleton-init-openrc/skeleton-init-openrc.mk
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton-init-openrc.mk
rename to buildroot/package/skeleton-init-openrc/skeleton-init-openrc.mk
diff --git a/software/package/skeleton-init-openrc/skeleton/dev/log b/buildroot/package/skeleton-init-openrc/skeleton/dev/log
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/dev/log
rename to buildroot/package/skeleton-init-openrc/skeleton/dev/log
diff --git a/software/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty b/buildroot/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
rename to buildroot/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
diff --git a/software/package/skeleton-init-openrc/skeleton/etc/fstab b/buildroot/package/skeleton-init-openrc/skeleton/etc/fstab
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/etc/fstab
rename to buildroot/package/skeleton-init-openrc/skeleton/etc/fstab
diff --git a/software/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty b/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty
rename to buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty
diff --git a/software/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs b/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
rename to buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
diff --git a/software/package/skeleton-init-openrc/skeleton/var/cache b/buildroot/package/skeleton-init-openrc/skeleton/var/cache
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/cache
rename to buildroot/package/skeleton-init-openrc/skeleton/var/cache
diff --git a/software/package/skeleton-init-openrc/skeleton/var/lib/misc b/buildroot/package/skeleton-init-openrc/skeleton/var/lib/misc
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/lib/misc
rename to buildroot/package/skeleton-init-openrc/skeleton/var/lib/misc
diff --git a/software/package/skeleton-init-openrc/skeleton/var/lock b/buildroot/package/skeleton-init-openrc/skeleton/var/lock
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/lock
rename to buildroot/package/skeleton-init-openrc/skeleton/var/lock
diff --git a/software/package/skeleton-init-openrc/skeleton/var/log b/buildroot/package/skeleton-init-openrc/skeleton/var/log
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/log
rename to buildroot/package/skeleton-init-openrc/skeleton/var/log
diff --git a/software/package/skeleton-init-openrc/skeleton/var/run b/buildroot/package/skeleton-init-openrc/skeleton/var/run
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/run
rename to buildroot/package/skeleton-init-openrc/skeleton/var/run
diff --git a/software/package/skeleton-init-openrc/skeleton/var/spool b/buildroot/package/skeleton-init-openrc/skeleton/var/spool
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/spool
rename to buildroot/package/skeleton-init-openrc/skeleton/var/spool
diff --git a/software/package/skeleton-init-openrc/skeleton/var/tmp b/buildroot/package/skeleton-init-openrc/skeleton/var/tmp
similarity index 100%
rename from software/package/skeleton-init-openrc/skeleton/var/tmp
rename to buildroot/package/skeleton-init-openrc/skeleton/var/tmp
diff --git a/software/package/skeleton-init-systemd/Config.in b/buildroot/package/skeleton-init-systemd/Config.in
similarity index 100%
rename from software/package/skeleton-init-systemd/Config.in
rename to buildroot/package/skeleton-init-systemd/Config.in
diff --git a/software/package/skeleton-init-systemd/skeleton-init-systemd.mk b/buildroot/package/skeleton-init-systemd/skeleton-init-systemd.mk
similarity index 100%
rename from software/package/skeleton-init-systemd/skeleton-init-systemd.mk
rename to buildroot/package/skeleton-init-systemd/skeleton-init-systemd.mk
diff --git a/software/package/skeleton-init-sysv/Config.in b/buildroot/package/skeleton-init-sysv/Config.in
similarity index 100%
rename from software/package/skeleton-init-sysv/Config.in
rename to buildroot/package/skeleton-init-sysv/Config.in
diff --git a/software/package/skeleton-init-sysv/skeleton-init-sysv.mk b/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton-init-sysv.mk
rename to buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk
diff --git a/software/package/skeleton-init-sysv/skeleton/dev/log b/buildroot/package/skeleton-init-sysv/skeleton/dev/log
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/dev/log
rename to buildroot/package/skeleton-init-sysv/skeleton/dev/log
diff --git a/software/package/skeleton-init-sysv/skeleton/dev/pts/.empty b/buildroot/package/skeleton-init-sysv/skeleton/dev/pts/.empty
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/dev/pts/.empty
rename to buildroot/package/skeleton-init-sysv/skeleton/dev/pts/.empty
diff --git a/software/package/skeleton-init-sysv/skeleton/dev/shm/.empty b/buildroot/package/skeleton-init-sysv/skeleton/dev/shm/.empty
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/dev/shm/.empty
rename to buildroot/package/skeleton-init-sysv/skeleton/dev/shm/.empty
diff --git a/software/package/skeleton-init-sysv/skeleton/etc/fstab b/buildroot/package/skeleton-init-sysv/skeleton/etc/fstab
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/etc/fstab
rename to buildroot/package/skeleton-init-sysv/skeleton/etc/fstab
diff --git a/software/package/skeleton-init-sysv/skeleton/var/cache b/buildroot/package/skeleton-init-sysv/skeleton/var/cache
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/cache
rename to buildroot/package/skeleton-init-sysv/skeleton/var/cache
diff --git a/software/package/skeleton-init-sysv/skeleton/var/lib/misc b/buildroot/package/skeleton-init-sysv/skeleton/var/lib/misc
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/lib/misc
rename to buildroot/package/skeleton-init-sysv/skeleton/var/lib/misc
diff --git a/software/package/skeleton-init-sysv/skeleton/var/lock b/buildroot/package/skeleton-init-sysv/skeleton/var/lock
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/lock
rename to buildroot/package/skeleton-init-sysv/skeleton/var/lock
diff --git a/software/package/skeleton-init-sysv/skeleton/var/log b/buildroot/package/skeleton-init-sysv/skeleton/var/log
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/log
rename to buildroot/package/skeleton-init-sysv/skeleton/var/log
diff --git a/software/package/skeleton-init-sysv/skeleton/var/run b/buildroot/package/skeleton-init-sysv/skeleton/var/run
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/run
rename to buildroot/package/skeleton-init-sysv/skeleton/var/run
diff --git a/software/package/skeleton-init-sysv/skeleton/var/spool b/buildroot/package/skeleton-init-sysv/skeleton/var/spool
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/spool
rename to buildroot/package/skeleton-init-sysv/skeleton/var/spool
diff --git a/software/package/skeleton-init-sysv/skeleton/var/tmp b/buildroot/package/skeleton-init-sysv/skeleton/var/tmp
similarity index 100%
rename from software/package/skeleton-init-sysv/skeleton/var/tmp
rename to buildroot/package/skeleton-init-sysv/skeleton/var/tmp
diff --git a/software/package/skeleton/Config.in b/buildroot/package/skeleton/Config.in
similarity index 100%
rename from software/package/skeleton/Config.in
rename to buildroot/package/skeleton/Config.in
diff --git a/software/package/skeleton/skeleton.mk b/buildroot/package/skeleton/skeleton.mk
similarity index 100%
rename from software/package/skeleton/skeleton.mk
rename to buildroot/package/skeleton/skeleton.mk
diff --git a/software/package/sl/Config.in b/buildroot/package/sl/Config.in
similarity index 100%
rename from software/package/sl/Config.in
rename to buildroot/package/sl/Config.in
diff --git a/software/package/sl/sl.hash b/buildroot/package/sl/sl.hash
similarity index 100%
rename from software/package/sl/sl.hash
rename to buildroot/package/sl/sl.hash
diff --git a/software/package/sl/sl.mk b/buildroot/package/sl/sl.mk
similarity index 100%
rename from software/package/sl/sl.mk
rename to buildroot/package/sl/sl.mk
diff --git a/software/package/slang/0001-slsh-libs.patch b/buildroot/package/slang/0001-slsh-libs.patch
similarity index 100%
rename from software/package/slang/0001-slsh-libs.patch
rename to buildroot/package/slang/0001-slsh-libs.patch
diff --git a/software/package/slang/Config.in b/buildroot/package/slang/Config.in
similarity index 100%
rename from software/package/slang/Config.in
rename to buildroot/package/slang/Config.in
diff --git a/software/package/slang/slang.hash b/buildroot/package/slang/slang.hash
similarity index 100%
rename from software/package/slang/slang.hash
rename to buildroot/package/slang/slang.hash
diff --git a/software/package/slang/slang.mk b/buildroot/package/slang/slang.mk
similarity index 100%
rename from software/package/slang/slang.mk
rename to buildroot/package/slang/slang.mk
diff --git a/software/package/slirp/Config.in b/buildroot/package/slirp/Config.in
similarity index 100%
rename from software/package/slirp/Config.in
rename to buildroot/package/slirp/Config.in
diff --git a/software/package/slirp/slirp.mk b/buildroot/package/slirp/slirp.mk
similarity index 100%
rename from software/package/slirp/slirp.mk
rename to buildroot/package/slirp/slirp.mk
diff --git a/software/package/smack/Config.in b/buildroot/package/smack/Config.in
similarity index 100%
rename from software/package/smack/Config.in
rename to buildroot/package/smack/Config.in
diff --git a/software/package/smack/smack.hash b/buildroot/package/smack/smack.hash
similarity index 100%
rename from software/package/smack/smack.hash
rename to buildroot/package/smack/smack.hash
diff --git a/software/package/smack/smack.mk b/buildroot/package/smack/smack.mk
similarity index 100%
rename from software/package/smack/smack.mk
rename to buildroot/package/smack/smack.mk
diff --git a/software/package/smartmontools/Config.in b/buildroot/package/smartmontools/Config.in
similarity index 100%
rename from software/package/smartmontools/Config.in
rename to buildroot/package/smartmontools/Config.in
diff --git a/software/package/smartmontools/smartmontools.hash b/buildroot/package/smartmontools/smartmontools.hash
similarity index 100%
rename from software/package/smartmontools/smartmontools.hash
rename to buildroot/package/smartmontools/smartmontools.hash
diff --git a/software/package/smartmontools/smartmontools.mk b/buildroot/package/smartmontools/smartmontools.mk
similarity index 100%
rename from software/package/smartmontools/smartmontools.mk
rename to buildroot/package/smartmontools/smartmontools.mk
diff --git a/software/package/smcroute/Config.in b/buildroot/package/smcroute/Config.in
similarity index 100%
rename from software/package/smcroute/Config.in
rename to buildroot/package/smcroute/Config.in
diff --git a/software/package/smcroute/smcroute.hash b/buildroot/package/smcroute/smcroute.hash
similarity index 100%
rename from software/package/smcroute/smcroute.hash
rename to buildroot/package/smcroute/smcroute.hash
diff --git a/software/package/smcroute/smcroute.mk b/buildroot/package/smcroute/smcroute.mk
similarity index 100%
rename from software/package/smcroute/smcroute.mk
rename to buildroot/package/smcroute/smcroute.mk
diff --git a/software/package/smstools3/0001-fix-Makefile.patch b/buildroot/package/smstools3/0001-fix-Makefile.patch
similarity index 100%
rename from software/package/smstools3/0001-fix-Makefile.patch
rename to buildroot/package/smstools3/0001-fix-Makefile.patch
diff --git a/software/package/smstools3/Config.in b/buildroot/package/smstools3/Config.in
similarity index 100%
rename from software/package/smstools3/Config.in
rename to buildroot/package/smstools3/Config.in
diff --git a/software/package/smstools3/S50smsd b/buildroot/package/smstools3/S50smsd
similarity index 100%
rename from software/package/smstools3/S50smsd
rename to buildroot/package/smstools3/S50smsd
diff --git a/software/package/smstools3/smstools3.hash b/buildroot/package/smstools3/smstools3.hash
similarity index 100%
rename from software/package/smstools3/smstools3.hash
rename to buildroot/package/smstools3/smstools3.hash
diff --git a/software/package/smstools3/smstools3.mk b/buildroot/package/smstools3/smstools3.mk
similarity index 100%
rename from software/package/smstools3/smstools3.mk
rename to buildroot/package/smstools3/smstools3.mk
diff --git a/software/package/snappy/Config.in b/buildroot/package/snappy/Config.in
similarity index 100%
rename from software/package/snappy/Config.in
rename to buildroot/package/snappy/Config.in
diff --git a/software/package/snappy/snappy.hash b/buildroot/package/snappy/snappy.hash
similarity index 100%
rename from software/package/snappy/snappy.hash
rename to buildroot/package/snappy/snappy.hash
diff --git a/software/package/snappy/snappy.mk b/buildroot/package/snappy/snappy.mk
similarity index 100%
rename from software/package/snappy/snappy.mk
rename to buildroot/package/snappy/snappy.mk
diff --git a/software/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch b/buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
similarity index 100%
rename from software/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
rename to buildroot/package/sngrep/0001-capture-fix-typo-in-FILE-object.patch
diff --git a/software/package/sngrep/Config.in b/buildroot/package/sngrep/Config.in
similarity index 100%
rename from software/package/sngrep/Config.in
rename to buildroot/package/sngrep/Config.in
diff --git a/software/package/sngrep/sngrep.hash b/buildroot/package/sngrep/sngrep.hash
similarity index 100%
rename from software/package/sngrep/sngrep.hash
rename to buildroot/package/sngrep/sngrep.hash
diff --git a/software/package/sngrep/sngrep.mk b/buildroot/package/sngrep/sngrep.mk
similarity index 100%
rename from software/package/sngrep/sngrep.mk
rename to buildroot/package/sngrep/sngrep.mk
diff --git a/software/package/snmpclitools/Config.in b/buildroot/package/snmpclitools/Config.in
similarity index 100%
rename from software/package/snmpclitools/Config.in
rename to buildroot/package/snmpclitools/Config.in
diff --git a/software/package/snmpclitools/snmpclitools.hash b/buildroot/package/snmpclitools/snmpclitools.hash
similarity index 100%
rename from software/package/snmpclitools/snmpclitools.hash
rename to buildroot/package/snmpclitools/snmpclitools.hash
diff --git a/software/package/snmpclitools/snmpclitools.mk b/buildroot/package/snmpclitools/snmpclitools.mk
similarity index 100%
rename from software/package/snmpclitools/snmpclitools.mk
rename to buildroot/package/snmpclitools/snmpclitools.mk
diff --git a/software/package/snmppp/Config.in b/buildroot/package/snmppp/Config.in
similarity index 100%
rename from software/package/snmppp/Config.in
rename to buildroot/package/snmppp/Config.in
diff --git a/software/package/snmppp/snmppp.hash b/buildroot/package/snmppp/snmppp.hash
similarity index 100%
rename from software/package/snmppp/snmppp.hash
rename to buildroot/package/snmppp/snmppp.hash
diff --git a/software/package/snmppp/snmppp.mk b/buildroot/package/snmppp/snmppp.mk
similarity index 100%
rename from software/package/snmppp/snmppp.mk
rename to buildroot/package/snmppp/snmppp.mk
diff --git a/software/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch b/buildroot/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch
similarity index 100%
rename from software/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch
rename to buildroot/package/snort/0001-configure.in-Avoid-path-poisoning-with-libpcap.patch
diff --git a/software/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch b/buildroot/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch
similarity index 100%
rename from software/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch
rename to buildroot/package/snort/0002-configure.in-Allow-to-override-the-INADDR_NONE-check.patch
diff --git a/software/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch b/buildroot/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch
similarity index 100%
rename from software/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch
rename to buildroot/package/snort/0003-configure.in-convert-AC_RUN_IFELSE-to-AC_CHECK_MEMBE.patch
diff --git a/software/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch b/buildroot/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch
similarity index 100%
rename from software/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch
rename to buildroot/package/snort/0004-configure.in-convert-AC_RUN_IFELSE-to-AC_COMPILE_IFE.patch
diff --git a/software/package/snort/0005-fix-sparc.patch b/buildroot/package/snort/0005-fix-sparc.patch
similarity index 100%
rename from software/package/snort/0005-fix-sparc.patch
rename to buildroot/package/snort/0005-fix-sparc.patch
diff --git a/software/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch b/buildroot/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch
similarity index 100%
rename from software/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch
rename to buildroot/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch
diff --git a/software/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch b/buildroot/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch
similarity index 100%
rename from software/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch
rename to buildroot/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch
diff --git a/software/package/snort/Config.in b/buildroot/package/snort/Config.in
similarity index 100%
rename from software/package/snort/Config.in
rename to buildroot/package/snort/Config.in
diff --git a/software/package/snort/snort.hash b/buildroot/package/snort/snort.hash
similarity index 100%
rename from software/package/snort/snort.hash
rename to buildroot/package/snort/snort.hash
diff --git a/software/package/snort/snort.mk b/buildroot/package/snort/snort.mk
similarity index 100%
rename from software/package/snort/snort.mk
rename to buildroot/package/snort/snort.mk
diff --git a/software/package/socat/0001-no-documentation.patch b/buildroot/package/socat/0001-no-documentation.patch
similarity index 100%
rename from software/package/socat/0001-no-documentation.patch
rename to buildroot/package/socat/0001-no-documentation.patch
diff --git a/software/package/socat/0002-compat-set-NETDB_INTERNAL.patch b/buildroot/package/socat/0002-compat-set-NETDB_INTERNAL.patch
similarity index 100%
rename from software/package/socat/0002-compat-set-NETDB_INTERNAL.patch
rename to buildroot/package/socat/0002-compat-set-NETDB_INTERNAL.patch
diff --git a/software/package/socat/Config.in b/buildroot/package/socat/Config.in
similarity index 100%
rename from software/package/socat/Config.in
rename to buildroot/package/socat/Config.in
diff --git a/software/package/socat/socat.hash b/buildroot/package/socat/socat.hash
similarity index 100%
rename from software/package/socat/socat.hash
rename to buildroot/package/socat/socat.hash
diff --git a/software/package/socat/socat.mk b/buildroot/package/socat/socat.mk
similarity index 100%
rename from software/package/socat/socat.mk
rename to buildroot/package/socat/socat.mk
diff --git a/software/package/socketcand/Config.in b/buildroot/package/socketcand/Config.in
similarity index 100%
rename from software/package/socketcand/Config.in
rename to buildroot/package/socketcand/Config.in
diff --git a/software/package/socketcand/socketcand.hash b/buildroot/package/socketcand/socketcand.hash
similarity index 100%
rename from software/package/socketcand/socketcand.hash
rename to buildroot/package/socketcand/socketcand.hash
diff --git a/software/package/socketcand/socketcand.mk b/buildroot/package/socketcand/socketcand.mk
similarity index 100%
rename from software/package/socketcand/socketcand.mk
rename to buildroot/package/socketcand/socketcand.mk
diff --git a/software/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch b/buildroot/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch
similarity index 100%
rename from software/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch
rename to buildroot/package/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch
diff --git a/software/package/sofia-sip/Config.in b/buildroot/package/sofia-sip/Config.in
similarity index 100%
rename from software/package/sofia-sip/Config.in
rename to buildroot/package/sofia-sip/Config.in
diff --git a/software/package/sofia-sip/sofia-sip.hash b/buildroot/package/sofia-sip/sofia-sip.hash
similarity index 100%
rename from software/package/sofia-sip/sofia-sip.hash
rename to buildroot/package/sofia-sip/sofia-sip.hash
diff --git a/software/package/sofia-sip/sofia-sip.mk b/buildroot/package/sofia-sip/sofia-sip.mk
similarity index 100%
rename from software/package/sofia-sip/sofia-sip.mk
rename to buildroot/package/sofia-sip/sofia-sip.mk
diff --git a/software/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch b/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
similarity index 100%
rename from software/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
rename to buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
diff --git a/software/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch b/buildroot/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch
similarity index 100%
rename from software/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch
rename to buildroot/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch
diff --git a/software/package/softether/0003-use-fhs-install-directories.patch b/buildroot/package/softether/0003-use-fhs-install-directories.patch
similarity index 100%
rename from software/package/softether/0003-use-fhs-install-directories.patch
rename to buildroot/package/softether/0003-use-fhs-install-directories.patch
diff --git a/software/package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch b/buildroot/package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch
similarity index 100%
rename from software/package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch
rename to buildroot/package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch
diff --git a/software/package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch b/buildroot/package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch
similarity index 100%
rename from software/package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch
rename to buildroot/package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch
diff --git a/software/package/softether/0006-cross-compile.patch b/buildroot/package/softether/0006-cross-compile.patch
similarity index 100%
rename from software/package/softether/0006-cross-compile.patch
rename to buildroot/package/softether/0006-cross-compile.patch
diff --git a/software/package/softether/0007-iconv.patch b/buildroot/package/softether/0007-iconv.patch
similarity index 100%
rename from software/package/softether/0007-iconv.patch
rename to buildroot/package/softether/0007-iconv.patch
diff --git a/software/package/softether/0008-librt.patch b/buildroot/package/softether/0008-librt.patch
similarity index 100%
rename from software/package/softether/0008-librt.patch
rename to buildroot/package/softether/0008-librt.patch
diff --git a/software/package/softether/0009-uclibc-ai-addrconfig.patch b/buildroot/package/softether/0009-uclibc-ai-addrconfig.patch
similarity index 100%
rename from software/package/softether/0009-uclibc-ai-addrconfig.patch
rename to buildroot/package/softether/0009-uclibc-ai-addrconfig.patch
diff --git a/software/package/softether/Config.in b/buildroot/package/softether/Config.in
similarity index 100%
rename from software/package/softether/Config.in
rename to buildroot/package/softether/Config.in
diff --git a/software/package/softether/softether.hash b/buildroot/package/softether/softether.hash
similarity index 100%
rename from software/package/softether/softether.hash
rename to buildroot/package/softether/softether.hash
diff --git a/software/package/softether/softether.mk b/buildroot/package/softether/softether.mk
similarity index 100%
rename from software/package/softether/softether.mk
rename to buildroot/package/softether/softether.mk
diff --git a/software/package/solarus/0001-cmake-remove-Werror.patch b/buildroot/package/solarus/0001-cmake-remove-Werror.patch
similarity index 100%
rename from software/package/solarus/0001-cmake-remove-Werror.patch
rename to buildroot/package/solarus/0001-cmake-remove-Werror.patch
diff --git a/software/package/solarus/Config.in b/buildroot/package/solarus/Config.in
similarity index 100%
rename from software/package/solarus/Config.in
rename to buildroot/package/solarus/Config.in
diff --git a/software/package/solarus/solarus.hash b/buildroot/package/solarus/solarus.hash
similarity index 100%
rename from software/package/solarus/solarus.hash
rename to buildroot/package/solarus/solarus.hash
diff --git a/software/package/solarus/solarus.mk b/buildroot/package/solarus/solarus.mk
similarity index 100%
rename from software/package/solarus/solarus.mk
rename to buildroot/package/solarus/solarus.mk
diff --git a/software/package/sound-theme-borealis/Config.in b/buildroot/package/sound-theme-borealis/Config.in
similarity index 100%
rename from software/package/sound-theme-borealis/Config.in
rename to buildroot/package/sound-theme-borealis/Config.in
diff --git a/software/package/sound-theme-borealis/sound-theme-borealis.hash b/buildroot/package/sound-theme-borealis/sound-theme-borealis.hash
similarity index 100%
rename from software/package/sound-theme-borealis/sound-theme-borealis.hash
rename to buildroot/package/sound-theme-borealis/sound-theme-borealis.hash
diff --git a/software/package/sound-theme-borealis/sound-theme-borealis.mk b/buildroot/package/sound-theme-borealis/sound-theme-borealis.mk
similarity index 100%
rename from software/package/sound-theme-borealis/sound-theme-borealis.mk
rename to buildroot/package/sound-theme-borealis/sound-theme-borealis.mk
diff --git a/software/package/sound-theme-freedesktop/Config.in b/buildroot/package/sound-theme-freedesktop/Config.in
similarity index 100%
rename from software/package/sound-theme-freedesktop/Config.in
rename to buildroot/package/sound-theme-freedesktop/Config.in
diff --git a/software/package/sound-theme-freedesktop/sound-theme-freedesktop.hash b/buildroot/package/sound-theme-freedesktop/sound-theme-freedesktop.hash
similarity index 100%
rename from software/package/sound-theme-freedesktop/sound-theme-freedesktop.hash
rename to buildroot/package/sound-theme-freedesktop/sound-theme-freedesktop.hash
diff --git a/software/package/sound-theme-freedesktop/sound-theme-freedesktop.mk b/buildroot/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
similarity index 100%
rename from software/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
rename to buildroot/package/sound-theme-freedesktop/sound-theme-freedesktop.mk
diff --git a/software/package/sox/0001-uclibc.patch b/buildroot/package/sox/0001-uclibc.patch
similarity index 100%
rename from software/package/sox/0001-uclibc.patch
rename to buildroot/package/sox/0001-uclibc.patch
diff --git a/software/package/sox/Config.in b/buildroot/package/sox/Config.in
similarity index 100%
rename from software/package/sox/Config.in
rename to buildroot/package/sox/Config.in
diff --git a/software/package/sox/sox.hash b/buildroot/package/sox/sox.hash
similarity index 100%
rename from software/package/sox/sox.hash
rename to buildroot/package/sox/sox.hash
diff --git a/software/package/sox/sox.mk b/buildroot/package/sox/sox.mk
similarity index 100%
rename from software/package/sox/sox.mk
rename to buildroot/package/sox/sox.mk
diff --git a/software/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch b/buildroot/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch
similarity index 100%
rename from software/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch
rename to buildroot/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch
diff --git a/software/package/sp-oops-extract/0002-stdint-cleanup.patch b/buildroot/package/sp-oops-extract/0002-stdint-cleanup.patch
similarity index 100%
rename from software/package/sp-oops-extract/0002-stdint-cleanup.patch
rename to buildroot/package/sp-oops-extract/0002-stdint-cleanup.patch
diff --git a/software/package/sp-oops-extract/Config.in b/buildroot/package/sp-oops-extract/Config.in
similarity index 100%
rename from software/package/sp-oops-extract/Config.in
rename to buildroot/package/sp-oops-extract/Config.in
diff --git a/software/package/sp-oops-extract/sp-oops-extract.hash b/buildroot/package/sp-oops-extract/sp-oops-extract.hash
similarity index 100%
rename from software/package/sp-oops-extract/sp-oops-extract.hash
rename to buildroot/package/sp-oops-extract/sp-oops-extract.hash
diff --git a/software/package/sp-oops-extract/sp-oops-extract.mk b/buildroot/package/sp-oops-extract/sp-oops-extract.mk
similarity index 100%
rename from software/package/sp-oops-extract/sp-oops-extract.mk
rename to buildroot/package/sp-oops-extract/sp-oops-extract.mk
diff --git a/software/package/spandsp/Config.in b/buildroot/package/spandsp/Config.in
similarity index 100%
rename from software/package/spandsp/Config.in
rename to buildroot/package/spandsp/Config.in
diff --git a/software/package/spandsp/spandsp.hash b/buildroot/package/spandsp/spandsp.hash
similarity index 100%
rename from software/package/spandsp/spandsp.hash
rename to buildroot/package/spandsp/spandsp.hash
diff --git a/software/package/spandsp/spandsp.mk b/buildroot/package/spandsp/spandsp.mk
similarity index 100%
rename from software/package/spandsp/spandsp.mk
rename to buildroot/package/spandsp/spandsp.mk
diff --git a/software/package/spawn-fcgi/Config.in b/buildroot/package/spawn-fcgi/Config.in
similarity index 100%
rename from software/package/spawn-fcgi/Config.in
rename to buildroot/package/spawn-fcgi/Config.in
diff --git a/software/package/spawn-fcgi/spawn-fcgi.hash b/buildroot/package/spawn-fcgi/spawn-fcgi.hash
similarity index 100%
rename from software/package/spawn-fcgi/spawn-fcgi.hash
rename to buildroot/package/spawn-fcgi/spawn-fcgi.hash
diff --git a/software/package/spawn-fcgi/spawn-fcgi.mk b/buildroot/package/spawn-fcgi/spawn-fcgi.mk
similarity index 100%
rename from software/package/spawn-fcgi/spawn-fcgi.mk
rename to buildroot/package/spawn-fcgi/spawn-fcgi.mk
diff --git a/software/package/spdlog/Config.in b/buildroot/package/spdlog/Config.in
similarity index 100%
rename from software/package/spdlog/Config.in
rename to buildroot/package/spdlog/Config.in
diff --git a/software/package/spdlog/spdlog.hash b/buildroot/package/spdlog/spdlog.hash
similarity index 100%
rename from software/package/spdlog/spdlog.hash
rename to buildroot/package/spdlog/spdlog.hash
diff --git a/software/package/spdlog/spdlog.mk b/buildroot/package/spdlog/spdlog.mk
similarity index 100%
rename from software/package/spdlog/spdlog.mk
rename to buildroot/package/spdlog/spdlog.mk
diff --git a/software/package/speex/0001-thumb2-support.patch b/buildroot/package/speex/0001-thumb2-support.patch
similarity index 100%
rename from software/package/speex/0001-thumb2-support.patch
rename to buildroot/package/speex/0001-thumb2-support.patch
diff --git a/software/package/speex/Config.in b/buildroot/package/speex/Config.in
similarity index 100%
rename from software/package/speex/Config.in
rename to buildroot/package/speex/Config.in
diff --git a/software/package/speex/speex.hash b/buildroot/package/speex/speex.hash
similarity index 100%
rename from software/package/speex/speex.hash
rename to buildroot/package/speex/speex.hash
diff --git a/software/package/speex/speex.mk b/buildroot/package/speex/speex.mk
similarity index 100%
rename from software/package/speex/speex.mk
rename to buildroot/package/speex/speex.mk
diff --git a/software/package/speexdsp/Config.in b/buildroot/package/speexdsp/Config.in
similarity index 100%
rename from software/package/speexdsp/Config.in
rename to buildroot/package/speexdsp/Config.in
diff --git a/software/package/speexdsp/speexdsp.hash b/buildroot/package/speexdsp/speexdsp.hash
similarity index 100%
rename from software/package/speexdsp/speexdsp.hash
rename to buildroot/package/speexdsp/speexdsp.hash
diff --git a/software/package/speexdsp/speexdsp.mk b/buildroot/package/speexdsp/speexdsp.mk
similarity index 100%
rename from software/package/speexdsp/speexdsp.mk
rename to buildroot/package/speexdsp/speexdsp.mk
diff --git a/software/package/sphinxbase/Config.in b/buildroot/package/sphinxbase/Config.in
similarity index 100%
rename from software/package/sphinxbase/Config.in
rename to buildroot/package/sphinxbase/Config.in
diff --git a/software/package/sphinxbase/sphinxbase.hash b/buildroot/package/sphinxbase/sphinxbase.hash
similarity index 100%
rename from software/package/sphinxbase/sphinxbase.hash
rename to buildroot/package/sphinxbase/sphinxbase.hash
diff --git a/software/package/sphinxbase/sphinxbase.mk b/buildroot/package/sphinxbase/sphinxbase.mk
similarity index 100%
rename from software/package/sphinxbase/sphinxbase.mk
rename to buildroot/package/sphinxbase/sphinxbase.mk
diff --git a/software/package/spi-tools/Config.in b/buildroot/package/spi-tools/Config.in
similarity index 100%
rename from software/package/spi-tools/Config.in
rename to buildroot/package/spi-tools/Config.in
diff --git a/software/package/spi-tools/spi-tools.hash b/buildroot/package/spi-tools/spi-tools.hash
similarity index 100%
rename from software/package/spi-tools/spi-tools.hash
rename to buildroot/package/spi-tools/spi-tools.hash
diff --git a/software/package/spi-tools/spi-tools.mk b/buildroot/package/spi-tools/spi-tools.mk
similarity index 100%
rename from software/package/spi-tools/spi-tools.mk
rename to buildroot/package/spi-tools/spi-tools.mk
diff --git a/software/package/spice-protocol/Config.in b/buildroot/package/spice-protocol/Config.in
similarity index 100%
rename from software/package/spice-protocol/Config.in
rename to buildroot/package/spice-protocol/Config.in
diff --git a/software/package/spice-protocol/spice-protocol.hash b/buildroot/package/spice-protocol/spice-protocol.hash
similarity index 100%
rename from software/package/spice-protocol/spice-protocol.hash
rename to buildroot/package/spice-protocol/spice-protocol.hash
diff --git a/software/package/spice-protocol/spice-protocol.mk b/buildroot/package/spice-protocol/spice-protocol.mk
similarity index 100%
rename from software/package/spice-protocol/spice-protocol.mk
rename to buildroot/package/spice-protocol/spice-protocol.mk
diff --git a/software/package/spice/0001-configure.ac-add-enable-tests.patch b/buildroot/package/spice/0001-configure.ac-add-enable-tests.patch
similarity index 100%
rename from software/package/spice/0001-configure.ac-add-enable-tests.patch
rename to buildroot/package/spice/0001-configure.ac-add-enable-tests.patch
diff --git a/software/package/spice/Config.in b/buildroot/package/spice/Config.in
similarity index 100%
rename from software/package/spice/Config.in
rename to buildroot/package/spice/Config.in
diff --git a/software/package/spice/spice.hash b/buildroot/package/spice/spice.hash
similarity index 100%
rename from software/package/spice/spice.hash
rename to buildroot/package/spice/spice.hash
diff --git a/software/package/spice/spice.mk b/buildroot/package/spice/spice.mk
similarity index 100%
rename from software/package/spice/spice.mk
rename to buildroot/package/spice/spice.mk
diff --git a/software/package/spidermonkey/0001-allow-newer-autoconf-versions.patch b/buildroot/package/spidermonkey/0001-allow-newer-autoconf-versions.patch
similarity index 100%
rename from software/package/spidermonkey/0001-allow-newer-autoconf-versions.patch
rename to buildroot/package/spidermonkey/0001-allow-newer-autoconf-versions.patch
diff --git a/software/package/spidermonkey/0002-allow-building-in-tree.patch b/buildroot/package/spidermonkey/0002-allow-building-in-tree.patch
similarity index 100%
rename from software/package/spidermonkey/0002-allow-building-in-tree.patch
rename to buildroot/package/spidermonkey/0002-allow-building-in-tree.patch
diff --git a/software/package/spidermonkey/0003-allow-unknown-configuration-options.patch b/buildroot/package/spidermonkey/0003-allow-unknown-configuration-options.patch
similarity index 100%
rename from software/package/spidermonkey/0003-allow-unknown-configuration-options.patch
rename to buildroot/package/spidermonkey/0003-allow-unknown-configuration-options.patch
diff --git a/software/package/spidermonkey/0004-fix-building-with-musl.patch b/buildroot/package/spidermonkey/0004-fix-building-with-musl.patch
similarity index 100%
rename from software/package/spidermonkey/0004-fix-building-with-musl.patch
rename to buildroot/package/spidermonkey/0004-fix-building-with-musl.patch
diff --git a/software/package/spidermonkey/0005-add-riscv-support.patch b/buildroot/package/spidermonkey/0005-add-riscv-support.patch
similarity index 100%
rename from software/package/spidermonkey/0005-add-riscv-support.patch
rename to buildroot/package/spidermonkey/0005-add-riscv-support.patch
diff --git a/software/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch b/buildroot/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch
similarity index 100%
rename from software/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch
rename to buildroot/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch
diff --git a/software/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch b/buildroot/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch
similarity index 100%
rename from software/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch
rename to buildroot/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch
diff --git a/software/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch b/buildroot/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch
similarity index 100%
rename from software/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch
rename to buildroot/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch
diff --git a/software/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch b/buildroot/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch
similarity index 100%
rename from software/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch
rename to buildroot/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch
diff --git a/software/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch b/buildroot/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch
similarity index 100%
rename from software/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch
rename to buildroot/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch
diff --git a/software/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch b/buildroot/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch
similarity index 100%
rename from software/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch
rename to buildroot/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch
diff --git a/software/package/spidermonkey/Config.in b/buildroot/package/spidermonkey/Config.in
similarity index 100%
rename from software/package/spidermonkey/Config.in
rename to buildroot/package/spidermonkey/Config.in
diff --git a/software/package/spidermonkey/spidermonkey.hash b/buildroot/package/spidermonkey/spidermonkey.hash
similarity index 100%
rename from software/package/spidermonkey/spidermonkey.hash
rename to buildroot/package/spidermonkey/spidermonkey.hash
diff --git a/software/package/spidermonkey/spidermonkey.mk b/buildroot/package/spidermonkey/spidermonkey.mk
similarity index 100%
rename from software/package/spidermonkey/spidermonkey.mk
rename to buildroot/package/spidermonkey/spidermonkey.mk
diff --git a/software/package/spidev_test/Config.in b/buildroot/package/spidev_test/Config.in
similarity index 100%
rename from software/package/spidev_test/Config.in
rename to buildroot/package/spidev_test/Config.in
diff --git a/software/package/spidev_test/spidev_test.hash b/buildroot/package/spidev_test/spidev_test.hash
similarity index 100%
rename from software/package/spidev_test/spidev_test.hash
rename to buildroot/package/spidev_test/spidev_test.hash
diff --git a/software/package/spidev_test/spidev_test.mk b/buildroot/package/spidev_test/spidev_test.mk
similarity index 100%
rename from software/package/spidev_test/spidev_test.mk
rename to buildroot/package/spidev_test/spidev_test.mk
diff --git a/software/package/sqlcipher/Config.in b/buildroot/package/sqlcipher/Config.in
similarity index 100%
rename from software/package/sqlcipher/Config.in
rename to buildroot/package/sqlcipher/Config.in
diff --git a/software/package/sqlcipher/sqlcipher.hash b/buildroot/package/sqlcipher/sqlcipher.hash
similarity index 100%
rename from software/package/sqlcipher/sqlcipher.hash
rename to buildroot/package/sqlcipher/sqlcipher.hash
diff --git a/software/package/sqlcipher/sqlcipher.mk b/buildroot/package/sqlcipher/sqlcipher.mk
similarity index 100%
rename from software/package/sqlcipher/sqlcipher.mk
rename to buildroot/package/sqlcipher/sqlcipher.mk
diff --git a/software/package/sqlite/Config.in b/buildroot/package/sqlite/Config.in
similarity index 100%
rename from software/package/sqlite/Config.in
rename to buildroot/package/sqlite/Config.in
diff --git a/software/package/sqlite/sqlite.hash b/buildroot/package/sqlite/sqlite.hash
similarity index 100%
rename from software/package/sqlite/sqlite.hash
rename to buildroot/package/sqlite/sqlite.hash
diff --git a/software/package/sqlite/sqlite.mk b/buildroot/package/sqlite/sqlite.mk
similarity index 100%
rename from software/package/sqlite/sqlite.mk
rename to buildroot/package/sqlite/sqlite.mk
diff --git a/software/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/buildroot/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
similarity index 100%
rename from software/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
rename to buildroot/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
diff --git a/software/package/squashfs/Config.in b/buildroot/package/squashfs/Config.in
similarity index 100%
rename from software/package/squashfs/Config.in
rename to buildroot/package/squashfs/Config.in
diff --git a/software/package/squashfs/Config.in.host b/buildroot/package/squashfs/Config.in.host
similarity index 100%
rename from software/package/squashfs/Config.in.host
rename to buildroot/package/squashfs/Config.in.host
diff --git a/software/package/squashfs/squashfs.hash b/buildroot/package/squashfs/squashfs.hash
similarity index 100%
rename from software/package/squashfs/squashfs.hash
rename to buildroot/package/squashfs/squashfs.hash
diff --git a/software/package/squashfs/squashfs.mk b/buildroot/package/squashfs/squashfs.mk
similarity index 100%
rename from software/package/squashfs/squashfs.mk
rename to buildroot/package/squashfs/squashfs.mk
diff --git a/software/package/squeezelite/Config.in b/buildroot/package/squeezelite/Config.in
similarity index 100%
rename from software/package/squeezelite/Config.in
rename to buildroot/package/squeezelite/Config.in
diff --git a/software/package/squeezelite/squeezelite.hash b/buildroot/package/squeezelite/squeezelite.hash
similarity index 100%
rename from software/package/squeezelite/squeezelite.hash
rename to buildroot/package/squeezelite/squeezelite.hash
diff --git a/software/package/squeezelite/squeezelite.mk b/buildroot/package/squeezelite/squeezelite.mk
similarity index 100%
rename from software/package/squeezelite/squeezelite.mk
rename to buildroot/package/squeezelite/squeezelite.mk
diff --git a/software/package/squid/Config.in b/buildroot/package/squid/Config.in
similarity index 100%
rename from software/package/squid/Config.in
rename to buildroot/package/squid/Config.in
diff --git a/software/package/squid/S97squid b/buildroot/package/squid/S97squid
similarity index 100%
rename from software/package/squid/S97squid
rename to buildroot/package/squid/S97squid
diff --git a/software/package/squid/squid.hash b/buildroot/package/squid/squid.hash
similarity index 100%
rename from software/package/squid/squid.hash
rename to buildroot/package/squid/squid.hash
diff --git a/software/package/squid/squid.mk b/buildroot/package/squid/squid.mk
similarity index 100%
rename from software/package/squid/squid.mk
rename to buildroot/package/squid/squid.mk
diff --git a/software/package/sredird/0001-termio.patch b/buildroot/package/sredird/0001-termio.patch
similarity index 100%
rename from software/package/sredird/0001-termio.patch
rename to buildroot/package/sredird/0001-termio.patch
diff --git a/software/package/sredird/Config.in b/buildroot/package/sredird/Config.in
similarity index 100%
rename from software/package/sredird/Config.in
rename to buildroot/package/sredird/Config.in
diff --git a/software/package/sredird/sredird.hash b/buildroot/package/sredird/sredird.hash
similarity index 100%
rename from software/package/sredird/sredird.hash
rename to buildroot/package/sredird/sredird.hash
diff --git a/software/package/sredird/sredird.mk b/buildroot/package/sredird/sredird.mk
similarity index 100%
rename from software/package/sredird/sredird.mk
rename to buildroot/package/sredird/sredird.mk
diff --git a/software/package/sshfs/Config.in b/buildroot/package/sshfs/Config.in
similarity index 100%
rename from software/package/sshfs/Config.in
rename to buildroot/package/sshfs/Config.in
diff --git a/software/package/sshfs/sshfs.hash b/buildroot/package/sshfs/sshfs.hash
similarity index 100%
rename from software/package/sshfs/sshfs.hash
rename to buildroot/package/sshfs/sshfs.hash
diff --git a/software/package/sshfs/sshfs.mk b/buildroot/package/sshfs/sshfs.mk
similarity index 100%
rename from software/package/sshfs/sshfs.mk
rename to buildroot/package/sshfs/sshfs.mk
diff --git a/software/package/sshguard/Config.in b/buildroot/package/sshguard/Config.in
similarity index 100%
rename from software/package/sshguard/Config.in
rename to buildroot/package/sshguard/Config.in
diff --git a/software/package/sshguard/S49sshguard b/buildroot/package/sshguard/S49sshguard
similarity index 100%
rename from software/package/sshguard/S49sshguard
rename to buildroot/package/sshguard/S49sshguard
diff --git a/software/package/sshguard/sshguard.hash b/buildroot/package/sshguard/sshguard.hash
similarity index 100%
rename from software/package/sshguard/sshguard.hash
rename to buildroot/package/sshguard/sshguard.hash
diff --git a/software/package/sshguard/sshguard.mk b/buildroot/package/sshguard/sshguard.mk
similarity index 100%
rename from software/package/sshguard/sshguard.mk
rename to buildroot/package/sshguard/sshguard.mk
diff --git a/software/package/sshpass/Config.in b/buildroot/package/sshpass/Config.in
similarity index 100%
rename from software/package/sshpass/Config.in
rename to buildroot/package/sshpass/Config.in
diff --git a/software/package/sshpass/sshpass.hash b/buildroot/package/sshpass/sshpass.hash
similarity index 100%
rename from software/package/sshpass/sshpass.hash
rename to buildroot/package/sshpass/sshpass.hash
diff --git a/software/package/sshpass/sshpass.mk b/buildroot/package/sshpass/sshpass.mk
similarity index 100%
rename from software/package/sshpass/sshpass.mk
rename to buildroot/package/sshpass/sshpass.mk
diff --git a/software/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch b/buildroot/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch
similarity index 100%
rename from software/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch
rename to buildroot/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch
diff --git a/software/package/sslh/Config.in b/buildroot/package/sslh/Config.in
similarity index 100%
rename from software/package/sslh/Config.in
rename to buildroot/package/sslh/Config.in
diff --git a/software/package/sslh/S35sslh b/buildroot/package/sslh/S35sslh
similarity index 100%
rename from software/package/sslh/S35sslh
rename to buildroot/package/sslh/S35sslh
diff --git a/software/package/sslh/sslh.hash b/buildroot/package/sslh/sslh.hash
similarity index 100%
rename from software/package/sslh/sslh.hash
rename to buildroot/package/sslh/sslh.hash
diff --git a/software/package/sslh/sslh.mk b/buildroot/package/sslh/sslh.mk
similarity index 100%
rename from software/package/sslh/sslh.mk
rename to buildroot/package/sslh/sslh.mk
diff --git a/software/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch b/buildroot/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch
similarity index 100%
rename from software/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch
rename to buildroot/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch
diff --git a/software/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch b/buildroot/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch
similarity index 100%
rename from software/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch
rename to buildroot/package/start-stop-daemon/0002-just-warn-on-missing-arch.patch
diff --git a/software/package/start-stop-daemon/Config.in b/buildroot/package/start-stop-daemon/Config.in
similarity index 100%
rename from software/package/start-stop-daemon/Config.in
rename to buildroot/package/start-stop-daemon/Config.in
diff --git a/software/package/start-stop-daemon/start-stop-daemon.hash b/buildroot/package/start-stop-daemon/start-stop-daemon.hash
similarity index 100%
rename from software/package/start-stop-daemon/start-stop-daemon.hash
rename to buildroot/package/start-stop-daemon/start-stop-daemon.hash
diff --git a/software/package/start-stop-daemon/start-stop-daemon.mk b/buildroot/package/start-stop-daemon/start-stop-daemon.mk
similarity index 100%
rename from software/package/start-stop-daemon/start-stop-daemon.mk
rename to buildroot/package/start-stop-daemon/start-stop-daemon.mk
diff --git a/software/package/startup-notification/Config.in b/buildroot/package/startup-notification/Config.in
similarity index 100%
rename from software/package/startup-notification/Config.in
rename to buildroot/package/startup-notification/Config.in
diff --git a/software/package/startup-notification/startup-notification.hash b/buildroot/package/startup-notification/startup-notification.hash
similarity index 100%
rename from software/package/startup-notification/startup-notification.hash
rename to buildroot/package/startup-notification/startup-notification.hash
diff --git a/software/package/startup-notification/startup-notification.mk b/buildroot/package/startup-notification/startup-notification.mk
similarity index 100%
rename from software/package/startup-notification/startup-notification.mk
rename to buildroot/package/startup-notification/startup-notification.mk
diff --git a/software/package/statserial/0001-ncurses-link.patch b/buildroot/package/statserial/0001-ncurses-link.patch
similarity index 100%
rename from software/package/statserial/0001-ncurses-link.patch
rename to buildroot/package/statserial/0001-ncurses-link.patch
diff --git a/software/package/statserial/Config.in b/buildroot/package/statserial/Config.in
similarity index 100%
rename from software/package/statserial/Config.in
rename to buildroot/package/statserial/Config.in
diff --git a/software/package/statserial/statserial.hash b/buildroot/package/statserial/statserial.hash
similarity index 100%
rename from software/package/statserial/statserial.hash
rename to buildroot/package/statserial/statserial.hash
diff --git a/software/package/statserial/statserial.mk b/buildroot/package/statserial/statserial.mk
similarity index 100%
rename from software/package/statserial/statserial.mk
rename to buildroot/package/statserial/statserial.mk
diff --git a/software/package/stella/0001-Add-cross-compilation-support.patch b/buildroot/package/stella/0001-Add-cross-compilation-support.patch
similarity index 100%
rename from software/package/stella/0001-Add-cross-compilation-support.patch
rename to buildroot/package/stella/0001-Add-cross-compilation-support.patch
diff --git a/software/package/stella/0002-Do-not-strip-when-installing.patch b/buildroot/package/stella/0002-Do-not-strip-when-installing.patch
similarity index 100%
rename from software/package/stella/0002-Do-not-strip-when-installing.patch
rename to buildroot/package/stella/0002-Do-not-strip-when-installing.patch
diff --git a/software/package/stella/0003-undef-PAGE_SIZE.patch b/buildroot/package/stella/0003-undef-PAGE_SIZE.patch
similarity index 100%
rename from software/package/stella/0003-undef-PAGE_SIZE.patch
rename to buildroot/package/stella/0003-undef-PAGE_SIZE.patch
diff --git a/software/package/stella/Config.in b/buildroot/package/stella/Config.in
similarity index 100%
rename from software/package/stella/Config.in
rename to buildroot/package/stella/Config.in
diff --git a/software/package/stella/stella.hash b/buildroot/package/stella/stella.hash
similarity index 100%
rename from software/package/stella/stella.hash
rename to buildroot/package/stella/stella.hash
diff --git a/software/package/stella/stella.mk b/buildroot/package/stella/stella.mk
similarity index 100%
rename from software/package/stella/stella.mk
rename to buildroot/package/stella/stella.mk
diff --git a/software/package/stellarium/Config.in b/buildroot/package/stellarium/Config.in
similarity index 100%
rename from software/package/stellarium/Config.in
rename to buildroot/package/stellarium/Config.in
diff --git a/software/package/stellarium/stellarium.hash b/buildroot/package/stellarium/stellarium.hash
similarity index 100%
rename from software/package/stellarium/stellarium.hash
rename to buildroot/package/stellarium/stellarium.hash
diff --git a/software/package/stellarium/stellarium.mk b/buildroot/package/stellarium/stellarium.mk
similarity index 100%
rename from software/package/stellarium/stellarium.mk
rename to buildroot/package/stellarium/stellarium.mk
diff --git a/software/package/stm32flash/Config.in b/buildroot/package/stm32flash/Config.in
similarity index 100%
rename from software/package/stm32flash/Config.in
rename to buildroot/package/stm32flash/Config.in
diff --git a/software/package/stm32flash/stm32flash.hash b/buildroot/package/stm32flash/stm32flash.hash
similarity index 100%
rename from software/package/stm32flash/stm32flash.hash
rename to buildroot/package/stm32flash/stm32flash.hash
diff --git a/software/package/stm32flash/stm32flash.mk b/buildroot/package/stm32flash/stm32flash.mk
similarity index 100%
rename from software/package/stm32flash/stm32flash.mk
rename to buildroot/package/stm32flash/stm32flash.mk
diff --git a/software/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch b/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch
similarity index 100%
rename from software/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch
rename to buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch
diff --git a/software/package/strace/Config.in b/buildroot/package/strace/Config.in
similarity index 100%
rename from software/package/strace/Config.in
rename to buildroot/package/strace/Config.in
diff --git a/software/package/strace/strace.hash b/buildroot/package/strace/strace.hash
similarity index 100%
rename from software/package/strace/strace.hash
rename to buildroot/package/strace/strace.hash
diff --git a/software/package/strace/strace.mk b/buildroot/package/strace/strace.mk
similarity index 100%
rename from software/package/strace/strace.mk
rename to buildroot/package/strace/strace.mk
diff --git a/software/package/stress-ng/Config.in b/buildroot/package/stress-ng/Config.in
similarity index 100%
rename from software/package/stress-ng/Config.in
rename to buildroot/package/stress-ng/Config.in
diff --git a/software/package/stress-ng/stress-ng.hash b/buildroot/package/stress-ng/stress-ng.hash
similarity index 100%
rename from software/package/stress-ng/stress-ng.hash
rename to buildroot/package/stress-ng/stress-ng.hash
diff --git a/software/package/stress-ng/stress-ng.mk b/buildroot/package/stress-ng/stress-ng.mk
similarity index 100%
rename from software/package/stress-ng/stress-ng.mk
rename to buildroot/package/stress-ng/stress-ng.mk
diff --git a/software/package/stress/Config.in b/buildroot/package/stress/Config.in
similarity index 100%
rename from software/package/stress/Config.in
rename to buildroot/package/stress/Config.in
diff --git a/software/package/stress/stress.hash b/buildroot/package/stress/stress.hash
similarity index 100%
rename from software/package/stress/stress.hash
rename to buildroot/package/stress/stress.hash
diff --git a/software/package/stress/stress.mk b/buildroot/package/stress/stress.mk
similarity index 100%
rename from software/package/stress/stress.mk
rename to buildroot/package/stress/stress.mk
diff --git a/software/package/strongswan/Config.in b/buildroot/package/strongswan/Config.in
similarity index 100%
rename from software/package/strongswan/Config.in
rename to buildroot/package/strongswan/Config.in
diff --git a/software/package/strongswan/strongswan.hash b/buildroot/package/strongswan/strongswan.hash
similarity index 100%
rename from software/package/strongswan/strongswan.hash
rename to buildroot/package/strongswan/strongswan.hash
diff --git a/software/package/strongswan/strongswan.mk b/buildroot/package/strongswan/strongswan.mk
similarity index 100%
rename from software/package/strongswan/strongswan.mk
rename to buildroot/package/strongswan/strongswan.mk
diff --git a/software/package/stunnel/Config.in b/buildroot/package/stunnel/Config.in
similarity index 100%
rename from software/package/stunnel/Config.in
rename to buildroot/package/stunnel/Config.in
diff --git a/software/package/stunnel/S50stunnel b/buildroot/package/stunnel/S50stunnel
similarity index 100%
rename from software/package/stunnel/S50stunnel
rename to buildroot/package/stunnel/S50stunnel
diff --git a/software/package/stunnel/stunnel.hash b/buildroot/package/stunnel/stunnel.hash
similarity index 100%
rename from software/package/stunnel/stunnel.hash
rename to buildroot/package/stunnel/stunnel.hash
diff --git a/software/package/stunnel/stunnel.mk b/buildroot/package/stunnel/stunnel.mk
similarity index 100%
rename from software/package/stunnel/stunnel.mk
rename to buildroot/package/stunnel/stunnel.mk
diff --git a/software/package/subversion/0001-dont-mangle-cflags.patch b/buildroot/package/subversion/0001-dont-mangle-cflags.patch
similarity index 100%
rename from software/package/subversion/0001-dont-mangle-cflags.patch
rename to buildroot/package/subversion/0001-dont-mangle-cflags.patch
diff --git a/software/package/subversion/0002-workaround-ac-run-ifelse.patch b/buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch
similarity index 100%
rename from software/package/subversion/0002-workaround-ac-run-ifelse.patch
rename to buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch
diff --git a/software/package/subversion/Config.in b/buildroot/package/subversion/Config.in
similarity index 100%
rename from software/package/subversion/Config.in
rename to buildroot/package/subversion/Config.in
diff --git a/software/package/subversion/subversion.hash b/buildroot/package/subversion/subversion.hash
similarity index 100%
rename from software/package/subversion/subversion.hash
rename to buildroot/package/subversion/subversion.hash
diff --git a/software/package/subversion/subversion.mk b/buildroot/package/subversion/subversion.mk
similarity index 100%
rename from software/package/subversion/subversion.mk
rename to buildroot/package/subversion/subversion.mk
diff --git a/software/package/sudo/Config.in b/buildroot/package/sudo/Config.in
similarity index 100%
rename from software/package/sudo/Config.in
rename to buildroot/package/sudo/Config.in
diff --git a/software/package/sudo/sudo.hash b/buildroot/package/sudo/sudo.hash
similarity index 100%
rename from software/package/sudo/sudo.hash
rename to buildroot/package/sudo/sudo.hash
diff --git a/software/package/sudo/sudo.mk b/buildroot/package/sudo/sudo.mk
similarity index 100%
rename from software/package/sudo/sudo.mk
rename to buildroot/package/sudo/sudo.mk
diff --git a/software/package/sudo/sudo.pam b/buildroot/package/sudo/sudo.pam
similarity index 100%
rename from software/package/sudo/sudo.pam
rename to buildroot/package/sudo/sudo.pam
diff --git a/software/package/sunwait/Config.in b/buildroot/package/sunwait/Config.in
similarity index 100%
rename from software/package/sunwait/Config.in
rename to buildroot/package/sunwait/Config.in
diff --git a/software/package/sunwait/sunwait.hash b/buildroot/package/sunwait/sunwait.hash
similarity index 100%
rename from software/package/sunwait/sunwait.hash
rename to buildroot/package/sunwait/sunwait.hash
diff --git a/software/package/sunwait/sunwait.mk b/buildroot/package/sunwait/sunwait.mk
similarity index 100%
rename from software/package/sunwait/sunwait.mk
rename to buildroot/package/sunwait/sunwait.mk
diff --git a/software/package/sunxi-boards/Config.in b/buildroot/package/sunxi-boards/Config.in
similarity index 100%
rename from software/package/sunxi-boards/Config.in
rename to buildroot/package/sunxi-boards/Config.in
diff --git a/software/package/sunxi-boards/sunxi-boards.hash b/buildroot/package/sunxi-boards/sunxi-boards.hash
similarity index 100%
rename from software/package/sunxi-boards/sunxi-boards.hash
rename to buildroot/package/sunxi-boards/sunxi-boards.hash
diff --git a/software/package/sunxi-boards/sunxi-boards.mk b/buildroot/package/sunxi-boards/sunxi-boards.mk
similarity index 100%
rename from software/package/sunxi-boards/sunxi-boards.mk
rename to buildroot/package/sunxi-boards/sunxi-boards.mk
diff --git a/software/package/sunxi-cedarx/Config.in b/buildroot/package/sunxi-cedarx/Config.in
similarity index 100%
rename from software/package/sunxi-cedarx/Config.in
rename to buildroot/package/sunxi-cedarx/Config.in
diff --git a/software/package/sunxi-cedarx/sunxi-cedarx.hash b/buildroot/package/sunxi-cedarx/sunxi-cedarx.hash
similarity index 100%
rename from software/package/sunxi-cedarx/sunxi-cedarx.hash
rename to buildroot/package/sunxi-cedarx/sunxi-cedarx.hash
diff --git a/software/package/sunxi-cedarx/sunxi-cedarx.mk b/buildroot/package/sunxi-cedarx/sunxi-cedarx.mk
similarity index 100%
rename from software/package/sunxi-cedarx/sunxi-cedarx.mk
rename to buildroot/package/sunxi-cedarx/sunxi-cedarx.mk
diff --git a/software/package/sunxi-mali-mainline-driver/Config.in b/buildroot/package/sunxi-mali-mainline-driver/Config.in
similarity index 100%
rename from software/package/sunxi-mali-mainline-driver/Config.in
rename to buildroot/package/sunxi-mali-mainline-driver/Config.in
diff --git a/software/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
similarity index 100%
rename from software/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
rename to buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash
diff --git a/software/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
similarity index 100%
rename from software/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
rename to buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk
diff --git a/software/package/sunxi-mali-mainline/Config.in b/buildroot/package/sunxi-mali-mainline/Config.in
similarity index 100%
rename from software/package/sunxi-mali-mainline/Config.in
rename to buildroot/package/sunxi-mali-mainline/Config.in
diff --git a/software/package/sunxi-mali-mainline/egl.pc b/buildroot/package/sunxi-mali-mainline/egl.pc
similarity index 100%
rename from software/package/sunxi-mali-mainline/egl.pc
rename to buildroot/package/sunxi-mali-mainline/egl.pc
diff --git a/software/package/sunxi-mali-mainline/glesv2.pc b/buildroot/package/sunxi-mali-mainline/glesv2.pc
similarity index 100%
rename from software/package/sunxi-mali-mainline/glesv2.pc
rename to buildroot/package/sunxi-mali-mainline/glesv2.pc
diff --git a/software/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.hash
similarity index 100%
rename from software/package/sunxi-mali-mainline/sunxi-mali-mainline.hash
rename to buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.hash
diff --git a/software/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
similarity index 100%
rename from software/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
rename to buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.mk
diff --git a/software/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch b/buildroot/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch
similarity index 100%
rename from software/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch
rename to buildroot/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch
diff --git a/software/package/sunxi-tools/Config.in b/buildroot/package/sunxi-tools/Config.in
similarity index 100%
rename from software/package/sunxi-tools/Config.in
rename to buildroot/package/sunxi-tools/Config.in
diff --git a/software/package/sunxi-tools/Config.in.host b/buildroot/package/sunxi-tools/Config.in.host
similarity index 100%
rename from software/package/sunxi-tools/Config.in.host
rename to buildroot/package/sunxi-tools/Config.in.host
diff --git a/software/package/sunxi-tools/sunxi-tools.hash b/buildroot/package/sunxi-tools/sunxi-tools.hash
similarity index 100%
rename from software/package/sunxi-tools/sunxi-tools.hash
rename to buildroot/package/sunxi-tools/sunxi-tools.hash
diff --git a/software/package/sunxi-tools/sunxi-tools.mk b/buildroot/package/sunxi-tools/sunxi-tools.mk
similarity index 100%
rename from software/package/sunxi-tools/sunxi-tools.mk
rename to buildroot/package/sunxi-tools/sunxi-tools.mk
diff --git a/software/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch b/buildroot/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
similarity index 100%
rename from software/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
rename to buildroot/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
diff --git a/software/package/supertux/0001-Fix-build-on-PowerPC.patch b/buildroot/package/supertux/0001-Fix-build-on-PowerPC.patch
similarity index 100%
rename from software/package/supertux/0001-Fix-build-on-PowerPC.patch
rename to buildroot/package/supertux/0001-Fix-build-on-PowerPC.patch
diff --git a/software/package/supertux/Config.in b/buildroot/package/supertux/Config.in
similarity index 100%
rename from software/package/supertux/Config.in
rename to buildroot/package/supertux/Config.in
diff --git a/software/package/supertux/supertux.hash b/buildroot/package/supertux/supertux.hash
similarity index 100%
rename from software/package/supertux/supertux.hash
rename to buildroot/package/supertux/supertux.hash
diff --git a/software/package/supertux/supertux.mk b/buildroot/package/supertux/supertux.mk
similarity index 100%
rename from software/package/supertux/supertux.mk
rename to buildroot/package/supertux/supertux.mk
diff --git a/software/package/supertuxkart/Config.in b/buildroot/package/supertuxkart/Config.in
similarity index 100%
rename from software/package/supertuxkart/Config.in
rename to buildroot/package/supertuxkart/Config.in
diff --git a/software/package/supertuxkart/supertuxkart.hash b/buildroot/package/supertuxkart/supertuxkart.hash
similarity index 100%
rename from software/package/supertuxkart/supertuxkart.hash
rename to buildroot/package/supertuxkart/supertuxkart.hash
diff --git a/software/package/supertuxkart/supertuxkart.mk b/buildroot/package/supertuxkart/supertuxkart.mk
similarity index 100%
rename from software/package/supertuxkart/supertuxkart.mk
rename to buildroot/package/supertuxkart/supertuxkart.mk
diff --git a/software/package/supervisor/Config.in b/buildroot/package/supervisor/Config.in
similarity index 100%
rename from software/package/supervisor/Config.in
rename to buildroot/package/supervisor/Config.in
diff --git a/software/package/supervisor/S99supervisord b/buildroot/package/supervisor/S99supervisord
similarity index 100%
rename from software/package/supervisor/S99supervisord
rename to buildroot/package/supervisor/S99supervisord
diff --git a/software/package/supervisor/supervisor.hash b/buildroot/package/supervisor/supervisor.hash
similarity index 100%
rename from software/package/supervisor/supervisor.hash
rename to buildroot/package/supervisor/supervisor.hash
diff --git a/software/package/supervisor/supervisor.mk b/buildroot/package/supervisor/supervisor.mk
similarity index 100%
rename from software/package/supervisor/supervisor.mk
rename to buildroot/package/supervisor/supervisor.mk
diff --git a/software/package/supervisor/supervisord.conf b/buildroot/package/supervisor/supervisord.conf
similarity index 100%
rename from software/package/supervisor/supervisord.conf
rename to buildroot/package/supervisor/supervisord.conf
diff --git a/software/package/supervisor/supervisord.service b/buildroot/package/supervisor/supervisord.service
similarity index 100%
rename from software/package/supervisor/supervisord.service
rename to buildroot/package/supervisor/supervisord.service
diff --git a/software/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch b/buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch
similarity index 100%
rename from software/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch
rename to buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch
diff --git a/software/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch b/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch
similarity index 100%
rename from software/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch
rename to buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch
diff --git a/software/package/suricata/Config.in b/buildroot/package/suricata/Config.in
similarity index 100%
rename from software/package/suricata/Config.in
rename to buildroot/package/suricata/Config.in
diff --git a/software/package/suricata/S99suricata b/buildroot/package/suricata/S99suricata
similarity index 100%
rename from software/package/suricata/S99suricata
rename to buildroot/package/suricata/S99suricata
diff --git a/software/package/suricata/suricata.hash b/buildroot/package/suricata/suricata.hash
similarity index 100%
rename from software/package/suricata/suricata.hash
rename to buildroot/package/suricata/suricata.hash
diff --git a/software/package/suricata/suricata.mk b/buildroot/package/suricata/suricata.mk
similarity index 100%
rename from software/package/suricata/suricata.mk
rename to buildroot/package/suricata/suricata.mk
diff --git a/software/package/suricata/suricata.service b/buildroot/package/suricata/suricata.service
similarity index 100%
rename from software/package/suricata/suricata.service
rename to buildroot/package/suricata/suricata.service
diff --git a/software/package/swig/Config.in.host b/buildroot/package/swig/Config.in.host
similarity index 100%
rename from software/package/swig/Config.in.host
rename to buildroot/package/swig/Config.in.host
diff --git a/software/package/swig/swig.hash b/buildroot/package/swig/swig.hash
similarity index 100%
rename from software/package/swig/swig.hash
rename to buildroot/package/swig/swig.hash
diff --git a/software/package/swig/swig.mk b/buildroot/package/swig/swig.mk
similarity index 100%
rename from software/package/swig/swig.mk
rename to buildroot/package/swig/swig.mk
diff --git a/software/package/swupdate/Config.in b/buildroot/package/swupdate/Config.in
similarity index 100%
rename from software/package/swupdate/Config.in
rename to buildroot/package/swupdate/Config.in
diff --git a/software/package/swupdate/swupdate.config b/buildroot/package/swupdate/swupdate.config
similarity index 100%
rename from software/package/swupdate/swupdate.config
rename to buildroot/package/swupdate/swupdate.config
diff --git a/software/package/swupdate/swupdate.hash b/buildroot/package/swupdate/swupdate.hash
similarity index 100%
rename from software/package/swupdate/swupdate.hash
rename to buildroot/package/swupdate/swupdate.hash
diff --git a/software/package/swupdate/swupdate.mk b/buildroot/package/swupdate/swupdate.mk
similarity index 100%
rename from software/package/swupdate/swupdate.mk
rename to buildroot/package/swupdate/swupdate.mk
diff --git a/software/package/sylpheed/Config.in b/buildroot/package/sylpheed/Config.in
similarity index 100%
rename from software/package/sylpheed/Config.in
rename to buildroot/package/sylpheed/Config.in
diff --git a/software/package/sylpheed/sylpheed.hash b/buildroot/package/sylpheed/sylpheed.hash
similarity index 100%
rename from software/package/sylpheed/sylpheed.hash
rename to buildroot/package/sylpheed/sylpheed.hash
diff --git a/software/package/sylpheed/sylpheed.mk b/buildroot/package/sylpheed/sylpheed.mk
similarity index 100%
rename from software/package/sylpheed/sylpheed.mk
rename to buildroot/package/sylpheed/sylpheed.mk
diff --git a/software/package/synergy/Config.in b/buildroot/package/synergy/Config.in
similarity index 100%
rename from software/package/synergy/Config.in
rename to buildroot/package/synergy/Config.in
diff --git a/software/package/synergy/synergy.hash b/buildroot/package/synergy/synergy.hash
similarity index 100%
rename from software/package/synergy/synergy.hash
rename to buildroot/package/synergy/synergy.hash
diff --git a/software/package/synergy/synergy.mk b/buildroot/package/synergy/synergy.mk
similarity index 100%
rename from software/package/synergy/synergy.mk
rename to buildroot/package/synergy/synergy.mk
diff --git a/software/package/sysdig/Config.in b/buildroot/package/sysdig/Config.in
similarity index 100%
rename from software/package/sysdig/Config.in
rename to buildroot/package/sysdig/Config.in
diff --git a/software/package/sysdig/sysdig.hash b/buildroot/package/sysdig/sysdig.hash
similarity index 100%
rename from software/package/sysdig/sysdig.hash
rename to buildroot/package/sysdig/sysdig.hash
diff --git a/software/package/sysdig/sysdig.mk b/buildroot/package/sysdig/sysdig.mk
similarity index 100%
rename from software/package/sysdig/sysdig.mk
rename to buildroot/package/sysdig/sysdig.mk
diff --git a/software/package/sysklogd/Config.in b/buildroot/package/sysklogd/Config.in
similarity index 100%
rename from software/package/sysklogd/Config.in
rename to buildroot/package/sysklogd/Config.in
diff --git a/software/package/sysklogd/S01syslogd b/buildroot/package/sysklogd/S01syslogd
similarity index 100%
rename from software/package/sysklogd/S01syslogd
rename to buildroot/package/sysklogd/S01syslogd
diff --git a/software/package/sysklogd/S02klogd b/buildroot/package/sysklogd/S02klogd
similarity index 100%
rename from software/package/sysklogd/S02klogd
rename to buildroot/package/sysklogd/S02klogd
diff --git a/software/package/sysklogd/klogd.service b/buildroot/package/sysklogd/klogd.service
similarity index 100%
rename from software/package/sysklogd/klogd.service
rename to buildroot/package/sysklogd/klogd.service
diff --git a/software/package/sysklogd/sysklogd.hash b/buildroot/package/sysklogd/sysklogd.hash
similarity index 100%
rename from software/package/sysklogd/sysklogd.hash
rename to buildroot/package/sysklogd/sysklogd.hash
diff --git a/software/package/sysklogd/sysklogd.mk b/buildroot/package/sysklogd/sysklogd.mk
similarity index 100%
rename from software/package/sysklogd/sysklogd.mk
rename to buildroot/package/sysklogd/sysklogd.mk
diff --git a/software/package/sysklogd/syslog.conf b/buildroot/package/sysklogd/syslog.conf
similarity index 100%
rename from software/package/sysklogd/syslog.conf
rename to buildroot/package/sysklogd/syslog.conf
diff --git a/software/package/sysklogd/syslogd.service b/buildroot/package/sysklogd/syslogd.service
similarity index 100%
rename from software/package/sysklogd/syslogd.service
rename to buildroot/package/sysklogd/syslogd.service
diff --git a/software/package/syslog-ng/0001-fix-build-on-uclibc.patch b/buildroot/package/syslog-ng/0001-fix-build-on-uclibc.patch
similarity index 100%
rename from software/package/syslog-ng/0001-fix-build-on-uclibc.patch
rename to buildroot/package/syslog-ng/0001-fix-build-on-uclibc.patch
diff --git a/software/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch b/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch
similarity index 100%
rename from software/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch
rename to buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch
diff --git a/software/package/syslog-ng/Config.in b/buildroot/package/syslog-ng/Config.in
similarity index 100%
rename from software/package/syslog-ng/Config.in
rename to buildroot/package/syslog-ng/Config.in
diff --git a/software/package/syslog-ng/S01syslog-ng b/buildroot/package/syslog-ng/S01syslog-ng
similarity index 100%
rename from software/package/syslog-ng/S01syslog-ng
rename to buildroot/package/syslog-ng/S01syslog-ng
diff --git a/software/package/syslog-ng/syslog-ng.conf b/buildroot/package/syslog-ng/syslog-ng.conf
similarity index 100%
rename from software/package/syslog-ng/syslog-ng.conf
rename to buildroot/package/syslog-ng/syslog-ng.conf
diff --git a/software/package/syslog-ng/syslog-ng.hash b/buildroot/package/syslog-ng/syslog-ng.hash
similarity index 100%
rename from software/package/syslog-ng/syslog-ng.hash
rename to buildroot/package/syslog-ng/syslog-ng.hash
diff --git a/software/package/syslog-ng/syslog-ng.mk b/buildroot/package/syslog-ng/syslog-ng.mk
similarity index 100%
rename from software/package/syslog-ng/syslog-ng.mk
rename to buildroot/package/syslog-ng/syslog-ng.mk
diff --git a/software/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch b/buildroot/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch
similarity index 100%
rename from software/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch
rename to buildroot/package/sysprof/0001-define-NT_GNU_BUILD_ID.patch
diff --git a/software/package/sysprof/Config.in b/buildroot/package/sysprof/Config.in
similarity index 100%
rename from software/package/sysprof/Config.in
rename to buildroot/package/sysprof/Config.in
diff --git a/software/package/sysprof/sysprof.hash b/buildroot/package/sysprof/sysprof.hash
similarity index 100%
rename from software/package/sysprof/sysprof.hash
rename to buildroot/package/sysprof/sysprof.hash
diff --git a/software/package/sysprof/sysprof.mk b/buildroot/package/sysprof/sysprof.mk
similarity index 100%
rename from software/package/sysprof/sysprof.mk
rename to buildroot/package/sysprof/sysprof.mk
diff --git a/software/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch b/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch
similarity index 100%
rename from software/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch
rename to buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch
diff --git a/software/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch b/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch
similarity index 100%
rename from software/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch
rename to buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch
diff --git a/software/package/sysrepo/Config.in b/buildroot/package/sysrepo/Config.in
similarity index 100%
rename from software/package/sysrepo/Config.in
rename to buildroot/package/sysrepo/Config.in
diff --git a/software/package/sysrepo/S51sysrepo-plugind b/buildroot/package/sysrepo/S51sysrepo-plugind
similarity index 100%
rename from software/package/sysrepo/S51sysrepo-plugind
rename to buildroot/package/sysrepo/S51sysrepo-plugind
diff --git a/software/package/sysrepo/sysrepo.hash b/buildroot/package/sysrepo/sysrepo.hash
similarity index 100%
rename from software/package/sysrepo/sysrepo.hash
rename to buildroot/package/sysrepo/sysrepo.hash
diff --git a/software/package/sysrepo/sysrepo.mk b/buildroot/package/sysrepo/sysrepo.mk
similarity index 100%
rename from software/package/sysrepo/sysrepo.mk
rename to buildroot/package/sysrepo/sysrepo.mk
diff --git a/software/package/sysstat/Config.in b/buildroot/package/sysstat/Config.in
similarity index 100%
rename from software/package/sysstat/Config.in
rename to buildroot/package/sysstat/Config.in
diff --git a/software/package/sysstat/sysstat.hash b/buildroot/package/sysstat/sysstat.hash
similarity index 100%
rename from software/package/sysstat/sysstat.hash
rename to buildroot/package/sysstat/sysstat.hash
diff --git a/software/package/sysstat/sysstat.mk b/buildroot/package/sysstat/sysstat.mk
similarity index 100%
rename from software/package/sysstat/sysstat.mk
rename to buildroot/package/sysstat/sysstat.mk
diff --git a/software/package/systemd-bootchart/Config.in b/buildroot/package/systemd-bootchart/Config.in
similarity index 100%
rename from software/package/systemd-bootchart/Config.in
rename to buildroot/package/systemd-bootchart/Config.in
diff --git a/software/package/systemd-bootchart/systemd-bootchart.hash b/buildroot/package/systemd-bootchart/systemd-bootchart.hash
similarity index 100%
rename from software/package/systemd-bootchart/systemd-bootchart.hash
rename to buildroot/package/systemd-bootchart/systemd-bootchart.hash
diff --git a/software/package/systemd-bootchart/systemd-bootchart.mk b/buildroot/package/systemd-bootchart/systemd-bootchart.mk
similarity index 100%
rename from software/package/systemd-bootchart/systemd-bootchart.mk
rename to buildroot/package/systemd-bootchart/systemd-bootchart.mk
diff --git a/software/package/systemd/80-buildroot.preset b/buildroot/package/systemd/80-buildroot.preset
similarity index 100%
rename from software/package/systemd/80-buildroot.preset
rename to buildroot/package/systemd/80-buildroot.preset
diff --git a/software/package/systemd/Config.in b/buildroot/package/systemd/Config.in
similarity index 100%
rename from software/package/systemd/Config.in
rename to buildroot/package/systemd/Config.in
diff --git a/software/package/systemd/Config.in.host b/buildroot/package/systemd/Config.in.host
similarity index 100%
rename from software/package/systemd/Config.in.host
rename to buildroot/package/systemd/Config.in.host
diff --git a/software/package/systemd/boot-files/buildroot.conf b/buildroot/package/systemd/boot-files/buildroot.conf
similarity index 100%
rename from software/package/systemd/boot-files/buildroot.conf
rename to buildroot/package/systemd/boot-files/buildroot.conf
diff --git a/software/package/systemd/boot-files/loader.conf b/buildroot/package/systemd/boot-files/loader.conf
similarity index 100%
rename from software/package/systemd/boot-files/loader.conf
rename to buildroot/package/systemd/boot-files/loader.conf
diff --git a/software/package/systemd/dhcp.network b/buildroot/package/systemd/dhcp.network
similarity index 100%
rename from software/package/systemd/dhcp.network
rename to buildroot/package/systemd/dhcp.network
diff --git a/software/package/systemd/systemd.hash b/buildroot/package/systemd/systemd.hash
similarity index 100%
rename from software/package/systemd/systemd.hash
rename to buildroot/package/systemd/systemd.hash
diff --git a/software/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk
similarity index 100%
rename from software/package/systemd/systemd.mk
rename to buildroot/package/systemd/systemd.mk
diff --git a/software/package/sysvinit/Config.in b/buildroot/package/sysvinit/Config.in
similarity index 100%
rename from software/package/sysvinit/Config.in
rename to buildroot/package/sysvinit/Config.in
diff --git a/software/package/sysvinit/inittab b/buildroot/package/sysvinit/inittab
similarity index 100%
rename from software/package/sysvinit/inittab
rename to buildroot/package/sysvinit/inittab
diff --git a/software/package/sysvinit/sysvinit.hash b/buildroot/package/sysvinit/sysvinit.hash
similarity index 100%
rename from software/package/sysvinit/sysvinit.hash
rename to buildroot/package/sysvinit/sysvinit.hash
diff --git a/software/package/sysvinit/sysvinit.mk b/buildroot/package/sysvinit/sysvinit.mk
similarity index 100%
rename from software/package/sysvinit/sysvinit.mk
rename to buildroot/package/sysvinit/sysvinit.mk
diff --git a/software/package/szip/Config.in b/buildroot/package/szip/Config.in
similarity index 100%
rename from software/package/szip/Config.in
rename to buildroot/package/szip/Config.in
diff --git a/software/package/szip/szip.hash b/buildroot/package/szip/szip.hash
similarity index 100%
rename from software/package/szip/szip.hash
rename to buildroot/package/szip/szip.hash
diff --git a/software/package/szip/szip.mk b/buildroot/package/szip/szip.mk
similarity index 100%
rename from software/package/szip/szip.mk
rename to buildroot/package/szip/szip.mk
diff --git a/software/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch b/buildroot/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch
similarity index 100%
rename from software/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch
rename to buildroot/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch
diff --git a/software/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch b/buildroot/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch
similarity index 100%
rename from software/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch
rename to buildroot/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch
diff --git a/software/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch b/buildroot/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch
similarity index 100%
rename from software/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch
rename to buildroot/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch
diff --git a/software/package/taglib/Config.in b/buildroot/package/taglib/Config.in
similarity index 100%
rename from software/package/taglib/Config.in
rename to buildroot/package/taglib/Config.in
diff --git a/software/package/taglib/taglib.hash b/buildroot/package/taglib/taglib.hash
similarity index 100%
rename from software/package/taglib/taglib.hash
rename to buildroot/package/taglib/taglib.hash
diff --git a/software/package/taglib/taglib.mk b/buildroot/package/taglib/taglib.mk
similarity index 100%
rename from software/package/taglib/taglib.mk
rename to buildroot/package/taglib/taglib.mk
diff --git a/software/package/tar/Config.in b/buildroot/package/tar/Config.in
similarity index 100%
rename from software/package/tar/Config.in
rename to buildroot/package/tar/Config.in
diff --git a/software/package/tar/tar.hash b/buildroot/package/tar/tar.hash
similarity index 100%
rename from software/package/tar/tar.hash
rename to buildroot/package/tar/tar.hash
diff --git a/software/package/tar/tar.mk b/buildroot/package/tar/tar.mk
similarity index 100%
rename from software/package/tar/tar.mk
rename to buildroot/package/tar/tar.mk
diff --git a/software/package/targetcli-fb/Config.in b/buildroot/package/targetcli-fb/Config.in
similarity index 100%
rename from software/package/targetcli-fb/Config.in
rename to buildroot/package/targetcli-fb/Config.in
diff --git a/software/package/targetcli-fb/S50target b/buildroot/package/targetcli-fb/S50target
similarity index 100%
rename from software/package/targetcli-fb/S50target
rename to buildroot/package/targetcli-fb/S50target
diff --git a/software/package/targetcli-fb/target.service b/buildroot/package/targetcli-fb/target.service
similarity index 100%
rename from software/package/targetcli-fb/target.service
rename to buildroot/package/targetcli-fb/target.service
diff --git a/software/package/targetcli-fb/targetcli-fb.hash b/buildroot/package/targetcli-fb/targetcli-fb.hash
similarity index 100%
rename from software/package/targetcli-fb/targetcli-fb.hash
rename to buildroot/package/targetcli-fb/targetcli-fb.hash
diff --git a/software/package/targetcli-fb/targetcli-fb.mk b/buildroot/package/targetcli-fb/targetcli-fb.mk
similarity index 100%
rename from software/package/targetcli-fb/targetcli-fb.mk
rename to buildroot/package/targetcli-fb/targetcli-fb.mk
diff --git a/software/package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch b/buildroot/package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch
similarity index 100%
rename from software/package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch
rename to buildroot/package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch
diff --git a/software/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch b/buildroot/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch
similarity index 100%
rename from software/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch
rename to buildroot/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch
diff --git a/software/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch b/buildroot/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch
similarity index 100%
rename from software/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch
rename to buildroot/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch
diff --git a/software/package/taskd/Config.in b/buildroot/package/taskd/Config.in
similarity index 100%
rename from software/package/taskd/Config.in
rename to buildroot/package/taskd/Config.in
diff --git a/software/package/taskd/taskd.hash b/buildroot/package/taskd/taskd.hash
similarity index 100%
rename from software/package/taskd/taskd.hash
rename to buildroot/package/taskd/taskd.hash
diff --git a/software/package/taskd/taskd.mk b/buildroot/package/taskd/taskd.mk
similarity index 100%
rename from software/package/taskd/taskd.mk
rename to buildroot/package/taskd/taskd.mk
diff --git a/software/package/tcf-agent/Config.in b/buildroot/package/tcf-agent/Config.in
similarity index 100%
rename from software/package/tcf-agent/Config.in
rename to buildroot/package/tcf-agent/Config.in
diff --git a/software/package/tcf-agent/S55tcf-agent b/buildroot/package/tcf-agent/S55tcf-agent
similarity index 100%
rename from software/package/tcf-agent/S55tcf-agent
rename to buildroot/package/tcf-agent/S55tcf-agent
diff --git a/software/package/tcf-agent/tcf-agent.hash b/buildroot/package/tcf-agent/tcf-agent.hash
similarity index 100%
rename from software/package/tcf-agent/tcf-agent.hash
rename to buildroot/package/tcf-agent/tcf-agent.hash
diff --git a/software/package/tcf-agent/tcf-agent.mk b/buildroot/package/tcf-agent/tcf-agent.mk
similarity index 100%
rename from software/package/tcf-agent/tcf-agent.mk
rename to buildroot/package/tcf-agent/tcf-agent.mk
diff --git a/software/package/tcf-agent/tcf-agent.service b/buildroot/package/tcf-agent/tcf-agent.service
similarity index 100%
rename from software/package/tcf-agent/tcf-agent.service
rename to buildroot/package/tcf-agent/tcf-agent.service
diff --git a/software/package/tcl/0001-dont-build-compat.patch b/buildroot/package/tcl/0001-dont-build-compat.patch
similarity index 100%
rename from software/package/tcl/0001-dont-build-compat.patch
rename to buildroot/package/tcl/0001-dont-build-compat.patch
diff --git a/software/package/tcl/Config.in b/buildroot/package/tcl/Config.in
similarity index 100%
rename from software/package/tcl/Config.in
rename to buildroot/package/tcl/Config.in
diff --git a/software/package/tcl/tcl.hash b/buildroot/package/tcl/tcl.hash
similarity index 100%
rename from software/package/tcl/tcl.hash
rename to buildroot/package/tcl/tcl.hash
diff --git a/software/package/tcl/tcl.mk b/buildroot/package/tcl/tcl.mk
similarity index 100%
rename from software/package/tcl/tcl.mk
rename to buildroot/package/tcl/tcl.mk
diff --git a/software/package/tclap/Config.in b/buildroot/package/tclap/Config.in
similarity index 100%
rename from software/package/tclap/Config.in
rename to buildroot/package/tclap/Config.in
diff --git a/software/package/tclap/tclap.hash b/buildroot/package/tclap/tclap.hash
similarity index 100%
rename from software/package/tclap/tclap.hash
rename to buildroot/package/tclap/tclap.hash
diff --git a/software/package/tclap/tclap.mk b/buildroot/package/tclap/tclap.mk
similarity index 100%
rename from software/package/tclap/tclap.mk
rename to buildroot/package/tclap/tclap.mk
diff --git a/software/package/tcllib/Config.in b/buildroot/package/tcllib/Config.in
similarity index 100%
rename from software/package/tcllib/Config.in
rename to buildroot/package/tcllib/Config.in
diff --git a/software/package/tcllib/tcllib.hash b/buildroot/package/tcllib/tcllib.hash
similarity index 100%
rename from software/package/tcllib/tcllib.hash
rename to buildroot/package/tcllib/tcllib.hash
diff --git a/software/package/tcllib/tcllib.mk b/buildroot/package/tcllib/tcllib.mk
similarity index 100%
rename from software/package/tcllib/tcllib.mk
rename to buildroot/package/tcllib/tcllib.mk
diff --git a/software/package/tcpdump/Config.in b/buildroot/package/tcpdump/Config.in
similarity index 100%
rename from software/package/tcpdump/Config.in
rename to buildroot/package/tcpdump/Config.in
diff --git a/software/package/tcpdump/tcpdump.hash b/buildroot/package/tcpdump/tcpdump.hash
similarity index 100%
rename from software/package/tcpdump/tcpdump.hash
rename to buildroot/package/tcpdump/tcpdump.hash
diff --git a/software/package/tcpdump/tcpdump.mk b/buildroot/package/tcpdump/tcpdump.mk
similarity index 100%
rename from software/package/tcpdump/tcpdump.mk
rename to buildroot/package/tcpdump/tcpdump.mk
diff --git a/software/package/tcping/Config.in b/buildroot/package/tcping/Config.in
similarity index 100%
rename from software/package/tcping/Config.in
rename to buildroot/package/tcping/Config.in
diff --git a/software/package/tcping/tcping.hash b/buildroot/package/tcping/tcping.hash
similarity index 100%
rename from software/package/tcping/tcping.hash
rename to buildroot/package/tcping/tcping.hash
diff --git a/software/package/tcping/tcping.mk b/buildroot/package/tcping/tcping.mk
similarity index 100%
rename from software/package/tcping/tcping.mk
rename to buildroot/package/tcping/tcping.mk
diff --git a/software/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch b/buildroot/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch
similarity index 100%
rename from software/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch
rename to buildroot/package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch
diff --git a/software/package/tcpreplay/Config.in b/buildroot/package/tcpreplay/Config.in
similarity index 100%
rename from software/package/tcpreplay/Config.in
rename to buildroot/package/tcpreplay/Config.in
diff --git a/software/package/tcpreplay/tcpreplay.hash b/buildroot/package/tcpreplay/tcpreplay.hash
similarity index 100%
rename from software/package/tcpreplay/tcpreplay.hash
rename to buildroot/package/tcpreplay/tcpreplay.hash
diff --git a/software/package/tcpreplay/tcpreplay.mk b/buildroot/package/tcpreplay/tcpreplay.mk
similarity index 100%
rename from software/package/tcpreplay/tcpreplay.mk
rename to buildroot/package/tcpreplay/tcpreplay.mk
diff --git a/software/package/tegrarcm/Config.in.host b/buildroot/package/tegrarcm/Config.in.host
similarity index 100%
rename from software/package/tegrarcm/Config.in.host
rename to buildroot/package/tegrarcm/Config.in.host
diff --git a/software/package/tegrarcm/tegrarcm.hash b/buildroot/package/tegrarcm/tegrarcm.hash
similarity index 100%
rename from software/package/tegrarcm/tegrarcm.hash
rename to buildroot/package/tegrarcm/tegrarcm.hash
diff --git a/software/package/tegrarcm/tegrarcm.mk b/buildroot/package/tegrarcm/tegrarcm.mk
similarity index 100%
rename from software/package/tegrarcm/tegrarcm.mk
rename to buildroot/package/tegrarcm/tegrarcm.mk
diff --git a/software/package/tekui/Config.in b/buildroot/package/tekui/Config.in
similarity index 100%
rename from software/package/tekui/Config.in
rename to buildroot/package/tekui/Config.in
diff --git a/software/package/tekui/tekui.hash b/buildroot/package/tekui/tekui.hash
similarity index 100%
rename from software/package/tekui/tekui.hash
rename to buildroot/package/tekui/tekui.hash
diff --git a/software/package/tekui/tekui.mk b/buildroot/package/tekui/tekui.mk
similarity index 100%
rename from software/package/tekui/tekui.mk
rename to buildroot/package/tekui/tekui.mk
diff --git a/software/package/terminology/Config.in b/buildroot/package/terminology/Config.in
similarity index 100%
rename from software/package/terminology/Config.in
rename to buildroot/package/terminology/Config.in
diff --git a/software/package/terminology/terminology.hash b/buildroot/package/terminology/terminology.hash
similarity index 100%
rename from software/package/terminology/terminology.hash
rename to buildroot/package/terminology/terminology.hash
diff --git a/software/package/terminology/terminology.mk b/buildroot/package/terminology/terminology.mk
similarity index 100%
rename from software/package/terminology/terminology.mk
rename to buildroot/package/terminology/terminology.mk
diff --git a/software/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch b/buildroot/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch
similarity index 100%
rename from software/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch
rename to buildroot/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch
diff --git a/software/package/tesseract-ocr/Config.in b/buildroot/package/tesseract-ocr/Config.in
similarity index 100%
rename from software/package/tesseract-ocr/Config.in
rename to buildroot/package/tesseract-ocr/Config.in
diff --git a/software/package/tesseract-ocr/tesseract-ocr.hash b/buildroot/package/tesseract-ocr/tesseract-ocr.hash
similarity index 100%
rename from software/package/tesseract-ocr/tesseract-ocr.hash
rename to buildroot/package/tesseract-ocr/tesseract-ocr.hash
diff --git a/software/package/tesseract-ocr/tesseract-ocr.mk b/buildroot/package/tesseract-ocr/tesseract-ocr.mk
similarity index 100%
rename from software/package/tesseract-ocr/tesseract-ocr.mk
rename to buildroot/package/tesseract-ocr/tesseract-ocr.mk
diff --git a/software/package/tftpd/Config.in b/buildroot/package/tftpd/Config.in
similarity index 100%
rename from software/package/tftpd/Config.in
rename to buildroot/package/tftpd/Config.in
diff --git a/software/package/tftpd/S80tftpd-hpa b/buildroot/package/tftpd/S80tftpd-hpa
similarity index 100%
rename from software/package/tftpd/S80tftpd-hpa
rename to buildroot/package/tftpd/S80tftpd-hpa
diff --git a/software/package/tftpd/tftpd.hash b/buildroot/package/tftpd/tftpd.hash
similarity index 100%
rename from software/package/tftpd/tftpd.hash
rename to buildroot/package/tftpd/tftpd.hash
diff --git a/software/package/tftpd/tftpd.mk b/buildroot/package/tftpd/tftpd.mk
similarity index 100%
rename from software/package/tftpd/tftpd.mk
rename to buildroot/package/tftpd/tftpd.mk
diff --git a/software/package/thermald/Config.in b/buildroot/package/thermald/Config.in
similarity index 100%
rename from software/package/thermald/Config.in
rename to buildroot/package/thermald/Config.in
diff --git a/software/package/thermald/thermald.hash b/buildroot/package/thermald/thermald.hash
similarity index 100%
rename from software/package/thermald/thermald.hash
rename to buildroot/package/thermald/thermald.hash
diff --git a/software/package/thermald/thermald.mk b/buildroot/package/thermald/thermald.mk
similarity index 100%
rename from software/package/thermald/thermald.mk
rename to buildroot/package/thermald/thermald.mk
diff --git a/software/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch b/buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch
similarity index 100%
rename from software/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch
rename to buildroot/package/thrift/0001-Force-to-keep-TPipedTransport-peek-to-avoid-linker-e.patch
diff --git a/software/package/thrift/Config.in b/buildroot/package/thrift/Config.in
similarity index 100%
rename from software/package/thrift/Config.in
rename to buildroot/package/thrift/Config.in
diff --git a/software/package/thrift/thrift.hash b/buildroot/package/thrift/thrift.hash
similarity index 100%
rename from software/package/thrift/thrift.hash
rename to buildroot/package/thrift/thrift.hash
diff --git a/software/package/thrift/thrift.mk b/buildroot/package/thrift/thrift.mk
similarity index 100%
rename from software/package/thrift/thrift.mk
rename to buildroot/package/thrift/thrift.mk
diff --git a/software/package/thttpd/Config.in b/buildroot/package/thttpd/Config.in
similarity index 100%
rename from software/package/thttpd/Config.in
rename to buildroot/package/thttpd/Config.in
diff --git a/software/package/thttpd/S90thttpd b/buildroot/package/thttpd/S90thttpd
similarity index 100%
rename from software/package/thttpd/S90thttpd
rename to buildroot/package/thttpd/S90thttpd
diff --git a/software/package/thttpd/thttpd.hash b/buildroot/package/thttpd/thttpd.hash
similarity index 100%
rename from software/package/thttpd/thttpd.hash
rename to buildroot/package/thttpd/thttpd.hash
diff --git a/software/package/thttpd/thttpd.mk b/buildroot/package/thttpd/thttpd.mk
similarity index 100%
rename from software/package/thttpd/thttpd.mk
rename to buildroot/package/thttpd/thttpd.mk
diff --git a/software/package/thttpd/thttpd.service b/buildroot/package/thttpd/thttpd.service
similarity index 100%
rename from software/package/thttpd/thttpd.service
rename to buildroot/package/thttpd/thttpd.service
diff --git a/software/package/ti-cgt-pru/Config.in.host b/buildroot/package/ti-cgt-pru/Config.in.host
similarity index 100%
rename from software/package/ti-cgt-pru/Config.in.host
rename to buildroot/package/ti-cgt-pru/Config.in.host
diff --git a/software/package/ti-cgt-pru/ti-cgt-pru.hash b/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash
similarity index 100%
rename from software/package/ti-cgt-pru/ti-cgt-pru.hash
rename to buildroot/package/ti-cgt-pru/ti-cgt-pru.hash
diff --git a/software/package/ti-cgt-pru/ti-cgt-pru.mk b/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk
similarity index 100%
rename from software/package/ti-cgt-pru/ti-cgt-pru.mk
rename to buildroot/package/ti-cgt-pru/ti-cgt-pru.mk
diff --git a/software/package/ti-gfx/0001-newclkapi.patch b/buildroot/package/ti-gfx/0001-newclkapi.patch
similarity index 100%
rename from software/package/ti-gfx/0001-newclkapi.patch
rename to buildroot/package/ti-gfx/0001-newclkapi.patch
diff --git a/software/package/ti-gfx/0002-fix-build-omaplfb-linux.patch b/buildroot/package/ti-gfx/0002-fix-build-omaplfb-linux.patch
similarity index 100%
rename from software/package/ti-gfx/0002-fix-build-omaplfb-linux.patch
rename to buildroot/package/ti-gfx/0002-fix-build-omaplfb-linux.patch
diff --git a/software/package/ti-gfx/0003-km_install_modules.patch b/buildroot/package/ti-gfx/0003-km_install_modules.patch
similarity index 100%
rename from software/package/ti-gfx/0003-km_install_modules.patch
rename to buildroot/package/ti-gfx/0003-km_install_modules.patch
diff --git a/software/package/ti-gfx/Config.in b/buildroot/package/ti-gfx/Config.in
similarity index 100%
rename from software/package/ti-gfx/Config.in
rename to buildroot/package/ti-gfx/Config.in
diff --git a/software/package/ti-gfx/S80ti-gfx b/buildroot/package/ti-gfx/S80ti-gfx
similarity index 100%
rename from software/package/ti-gfx/S80ti-gfx
rename to buildroot/package/ti-gfx/S80ti-gfx
diff --git a/software/package/ti-gfx/egl.pc b/buildroot/package/ti-gfx/egl.pc
similarity index 100%
rename from software/package/ti-gfx/egl.pc
rename to buildroot/package/ti-gfx/egl.pc
diff --git a/software/package/ti-gfx/esrev.sh b/buildroot/package/ti-gfx/esrev.sh
similarity index 100%
rename from software/package/ti-gfx/esrev.sh
rename to buildroot/package/ti-gfx/esrev.sh
diff --git a/software/package/ti-gfx/glesv2.pc b/buildroot/package/ti-gfx/glesv2.pc
similarity index 100%
rename from software/package/ti-gfx/glesv2.pc
rename to buildroot/package/ti-gfx/glesv2.pc
diff --git a/software/package/ti-gfx/powervr.ini b/buildroot/package/ti-gfx/powervr.ini
similarity index 100%
rename from software/package/ti-gfx/powervr.ini
rename to buildroot/package/ti-gfx/powervr.ini
diff --git a/software/package/ti-gfx/ti-gfx.hash b/buildroot/package/ti-gfx/ti-gfx.hash
similarity index 100%
rename from software/package/ti-gfx/ti-gfx.hash
rename to buildroot/package/ti-gfx/ti-gfx.hash
diff --git a/software/package/ti-gfx/ti-gfx.mk b/buildroot/package/ti-gfx/ti-gfx.mk
similarity index 100%
rename from software/package/ti-gfx/ti-gfx.mk
rename to buildroot/package/ti-gfx/ti-gfx.mk
diff --git a/software/package/ti-gfx/ti-gfx.service b/buildroot/package/ti-gfx/ti-gfx.service
similarity index 100%
rename from software/package/ti-gfx/ti-gfx.service
rename to buildroot/package/ti-gfx/ti-gfx.service
diff --git a/software/package/ti-sgx-demos/Config.in b/buildroot/package/ti-sgx-demos/Config.in
similarity index 100%
rename from software/package/ti-sgx-demos/Config.in
rename to buildroot/package/ti-sgx-demos/Config.in
diff --git a/software/package/ti-sgx-demos/ti-sgx-demos.hash b/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash
similarity index 100%
rename from software/package/ti-sgx-demos/ti-sgx-demos.hash
rename to buildroot/package/ti-sgx-demos/ti-sgx-demos.hash
diff --git a/software/package/ti-sgx-demos/ti-sgx-demos.mk b/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk
similarity index 100%
rename from software/package/ti-sgx-demos/ti-sgx-demos.mk
rename to buildroot/package/ti-sgx-demos/ti-sgx-demos.mk
diff --git a/software/package/ti-sgx-km/Config.in b/buildroot/package/ti-sgx-km/Config.in
similarity index 100%
rename from software/package/ti-sgx-km/Config.in
rename to buildroot/package/ti-sgx-km/Config.in
diff --git a/software/package/ti-sgx-km/ti-sgx-km.hash b/buildroot/package/ti-sgx-km/ti-sgx-km.hash
similarity index 100%
rename from software/package/ti-sgx-km/ti-sgx-km.hash
rename to buildroot/package/ti-sgx-km/ti-sgx-km.hash
diff --git a/software/package/ti-sgx-km/ti-sgx-km.mk b/buildroot/package/ti-sgx-km/ti-sgx-km.mk
similarity index 100%
rename from software/package/ti-sgx-km/ti-sgx-km.mk
rename to buildroot/package/ti-sgx-km/ti-sgx-km.mk
diff --git a/software/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch b/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch
similarity index 100%
rename from software/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch
rename to buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch
diff --git a/software/package/ti-sgx-libgbm/Config.in b/buildroot/package/ti-sgx-libgbm/Config.in
similarity index 100%
rename from software/package/ti-sgx-libgbm/Config.in
rename to buildroot/package/ti-sgx-libgbm/Config.in
diff --git a/software/package/ti-sgx-libgbm/ti-sgx-libgbm.hash b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash
similarity index 100%
rename from software/package/ti-sgx-libgbm/ti-sgx-libgbm.hash
rename to buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash
diff --git a/software/package/ti-sgx-libgbm/ti-sgx-libgbm.mk b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk
similarity index 100%
rename from software/package/ti-sgx-libgbm/ti-sgx-libgbm.mk
rename to buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk
diff --git a/software/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch b/buildroot/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch
similarity index 100%
rename from software/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch
rename to buildroot/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch
diff --git a/software/package/ti-sgx-um/Config.in b/buildroot/package/ti-sgx-um/Config.in
similarity index 100%
rename from software/package/ti-sgx-um/Config.in
rename to buildroot/package/ti-sgx-um/Config.in
diff --git a/software/package/ti-sgx-um/S80ti-sgx b/buildroot/package/ti-sgx-um/S80ti-sgx
similarity index 100%
rename from software/package/ti-sgx-um/S80ti-sgx
rename to buildroot/package/ti-sgx-um/S80ti-sgx
diff --git a/software/package/ti-sgx-um/ti-sgx-um.hash b/buildroot/package/ti-sgx-um/ti-sgx-um.hash
similarity index 100%
rename from software/package/ti-sgx-um/ti-sgx-um.hash
rename to buildroot/package/ti-sgx-um/ti-sgx-um.hash
diff --git a/software/package/ti-sgx-um/ti-sgx-um.mk b/buildroot/package/ti-sgx-um/ti-sgx-um.mk
similarity index 100%
rename from software/package/ti-sgx-um/ti-sgx-um.mk
rename to buildroot/package/ti-sgx-um/ti-sgx-um.mk
diff --git a/software/package/ti-uim/Config.in b/buildroot/package/ti-uim/Config.in
similarity index 100%
rename from software/package/ti-uim/Config.in
rename to buildroot/package/ti-uim/Config.in
diff --git a/software/package/ti-uim/ti-uim.hash b/buildroot/package/ti-uim/ti-uim.hash
similarity index 100%
rename from software/package/ti-uim/ti-uim.hash
rename to buildroot/package/ti-uim/ti-uim.hash
diff --git a/software/package/ti-uim/ti-uim.mk b/buildroot/package/ti-uim/ti-uim.mk
similarity index 100%
rename from software/package/ti-uim/ti-uim.mk
rename to buildroot/package/ti-uim/ti-uim.mk
diff --git a/software/package/ti-utils/Config.in b/buildroot/package/ti-utils/Config.in
similarity index 100%
rename from software/package/ti-utils/Config.in
rename to buildroot/package/ti-utils/Config.in
diff --git a/software/package/ti-utils/ti-utils.hash b/buildroot/package/ti-utils/ti-utils.hash
similarity index 100%
rename from software/package/ti-utils/ti-utils.hash
rename to buildroot/package/ti-utils/ti-utils.hash
diff --git a/software/package/ti-utils/ti-utils.mk b/buildroot/package/ti-utils/ti-utils.mk
similarity index 100%
rename from software/package/ti-utils/ti-utils.mk
rename to buildroot/package/ti-utils/ti-utils.mk
diff --git a/software/package/tiff/Config.in b/buildroot/package/tiff/Config.in
similarity index 100%
rename from software/package/tiff/Config.in
rename to buildroot/package/tiff/Config.in
diff --git a/software/package/tiff/tiff.hash b/buildroot/package/tiff/tiff.hash
similarity index 100%
rename from software/package/tiff/tiff.hash
rename to buildroot/package/tiff/tiff.hash
diff --git a/software/package/tiff/tiff.mk b/buildroot/package/tiff/tiff.mk
similarity index 100%
rename from software/package/tiff/tiff.mk
rename to buildroot/package/tiff/tiff.mk
diff --git a/software/package/time/Config.in b/buildroot/package/time/Config.in
similarity index 100%
rename from software/package/time/Config.in
rename to buildroot/package/time/Config.in
diff --git a/software/package/time/time.hash b/buildroot/package/time/time.hash
similarity index 100%
rename from software/package/time/time.hash
rename to buildroot/package/time/time.hash
diff --git a/software/package/time/time.mk b/buildroot/package/time/time.mk
similarity index 100%
rename from software/package/time/time.mk
rename to buildroot/package/time/time.mk
diff --git a/software/package/tinc/Config.in b/buildroot/package/tinc/Config.in
similarity index 100%
rename from software/package/tinc/Config.in
rename to buildroot/package/tinc/Config.in
diff --git a/software/package/tinc/tinc.hash b/buildroot/package/tinc/tinc.hash
similarity index 100%
rename from software/package/tinc/tinc.hash
rename to buildroot/package/tinc/tinc.hash
diff --git a/software/package/tinc/tinc.mk b/buildroot/package/tinc/tinc.mk
similarity index 100%
rename from software/package/tinc/tinc.mk
rename to buildroot/package/tinc/tinc.mk
diff --git a/software/package/tini/Config.in b/buildroot/package/tini/Config.in
similarity index 100%
rename from software/package/tini/Config.in
rename to buildroot/package/tini/Config.in
diff --git a/software/package/tini/tini.hash b/buildroot/package/tini/tini.hash
similarity index 100%
rename from software/package/tini/tini.hash
rename to buildroot/package/tini/tini.hash
diff --git a/software/package/tini/tini.mk b/buildroot/package/tini/tini.mk
similarity index 100%
rename from software/package/tini/tini.mk
rename to buildroot/package/tini/tini.mk
diff --git a/software/package/tinyalsa/0001-disable-doxygen-usage.patch b/buildroot/package/tinyalsa/0001-disable-doxygen-usage.patch
similarity index 100%
rename from software/package/tinyalsa/0001-disable-doxygen-usage.patch
rename to buildroot/package/tinyalsa/0001-disable-doxygen-usage.patch
diff --git a/software/package/tinyalsa/0002-interval.h-add-missing-header.patch b/buildroot/package/tinyalsa/0002-interval.h-add-missing-header.patch
similarity index 100%
rename from software/package/tinyalsa/0002-interval.h-add-missing-header.patch
rename to buildroot/package/tinyalsa/0002-interval.h-add-missing-header.patch
diff --git a/software/package/tinyalsa/Config.in b/buildroot/package/tinyalsa/Config.in
similarity index 100%
rename from software/package/tinyalsa/Config.in
rename to buildroot/package/tinyalsa/Config.in
diff --git a/software/package/tinyalsa/tinyalsa.hash b/buildroot/package/tinyalsa/tinyalsa.hash
similarity index 100%
rename from software/package/tinyalsa/tinyalsa.hash
rename to buildroot/package/tinyalsa/tinyalsa.hash
diff --git a/software/package/tinyalsa/tinyalsa.mk b/buildroot/package/tinyalsa/tinyalsa.mk
similarity index 100%
rename from software/package/tinyalsa/tinyalsa.mk
rename to buildroot/package/tinyalsa/tinyalsa.mk
diff --git a/software/package/tinycbor/Config.in b/buildroot/package/tinycbor/Config.in
similarity index 100%
rename from software/package/tinycbor/Config.in
rename to buildroot/package/tinycbor/Config.in
diff --git a/software/package/tinycbor/tinycbor.hash b/buildroot/package/tinycbor/tinycbor.hash
similarity index 100%
rename from software/package/tinycbor/tinycbor.hash
rename to buildroot/package/tinycbor/tinycbor.hash
diff --git a/software/package/tinycbor/tinycbor.mk b/buildroot/package/tinycbor/tinycbor.mk
similarity index 100%
rename from software/package/tinycbor/tinycbor.mk
rename to buildroot/package/tinycbor/tinycbor.mk
diff --git a/software/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch b/buildroot/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch
similarity index 100%
rename from software/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch
rename to buildroot/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch
diff --git a/software/package/tinydtls/Config.in b/buildroot/package/tinydtls/Config.in
similarity index 100%
rename from software/package/tinydtls/Config.in
rename to buildroot/package/tinydtls/Config.in
diff --git a/software/package/tinydtls/tinydtls.hash b/buildroot/package/tinydtls/tinydtls.hash
similarity index 100%
rename from software/package/tinydtls/tinydtls.hash
rename to buildroot/package/tinydtls/tinydtls.hash
diff --git a/software/package/tinydtls/tinydtls.mk b/buildroot/package/tinydtls/tinydtls.mk
similarity index 100%
rename from software/package/tinydtls/tinydtls.mk
rename to buildroot/package/tinydtls/tinydtls.mk
diff --git a/software/package/tinyhttpd/0001-misc-fixes.patch b/buildroot/package/tinyhttpd/0001-misc-fixes.patch
similarity index 100%
rename from software/package/tinyhttpd/0001-misc-fixes.patch
rename to buildroot/package/tinyhttpd/0001-misc-fixes.patch
diff --git a/software/package/tinyhttpd/Config.in b/buildroot/package/tinyhttpd/Config.in
similarity index 100%
rename from software/package/tinyhttpd/Config.in
rename to buildroot/package/tinyhttpd/Config.in
diff --git a/software/package/tinyhttpd/S85tinyhttpd b/buildroot/package/tinyhttpd/S85tinyhttpd
similarity index 100%
rename from software/package/tinyhttpd/S85tinyhttpd
rename to buildroot/package/tinyhttpd/S85tinyhttpd
diff --git a/software/package/tinyhttpd/tinyhttpd.hash b/buildroot/package/tinyhttpd/tinyhttpd.hash
similarity index 100%
rename from software/package/tinyhttpd/tinyhttpd.hash
rename to buildroot/package/tinyhttpd/tinyhttpd.hash
diff --git a/software/package/tinyhttpd/tinyhttpd.mk b/buildroot/package/tinyhttpd/tinyhttpd.mk
similarity index 100%
rename from software/package/tinyhttpd/tinyhttpd.mk
rename to buildroot/package/tinyhttpd/tinyhttpd.mk
diff --git a/software/package/tinyhttpd/tinyhttpd.service b/buildroot/package/tinyhttpd/tinyhttpd.service
similarity index 100%
rename from software/package/tinyhttpd/tinyhttpd.service
rename to buildroot/package/tinyhttpd/tinyhttpd.service
diff --git a/software/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/buildroot/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch
similarity index 100%
rename from software/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch
rename to buildroot/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch
diff --git a/software/package/tinymembench/Config.in b/buildroot/package/tinymembench/Config.in
similarity index 100%
rename from software/package/tinymembench/Config.in
rename to buildroot/package/tinymembench/Config.in
diff --git a/software/package/tinymembench/tinymembench.hash b/buildroot/package/tinymembench/tinymembench.hash
similarity index 100%
rename from software/package/tinymembench/tinymembench.hash
rename to buildroot/package/tinymembench/tinymembench.hash
diff --git a/software/package/tinymembench/tinymembench.mk b/buildroot/package/tinymembench/tinymembench.mk
similarity index 100%
rename from software/package/tinymembench/tinymembench.mk
rename to buildroot/package/tinymembench/tinymembench.mk
diff --git a/software/package/tinyssh/Config.in b/buildroot/package/tinyssh/Config.in
similarity index 100%
rename from software/package/tinyssh/Config.in
rename to buildroot/package/tinyssh/Config.in
diff --git a/software/package/tinyssh/tinyssh.hash b/buildroot/package/tinyssh/tinyssh.hash
similarity index 100%
rename from software/package/tinyssh/tinyssh.hash
rename to buildroot/package/tinyssh/tinyssh.hash
diff --git a/software/package/tinyssh/tinyssh.mk b/buildroot/package/tinyssh/tinyssh.mk
similarity index 100%
rename from software/package/tinyssh/tinyssh.mk
rename to buildroot/package/tinyssh/tinyssh.mk
diff --git a/software/package/tinyxml/Config.in b/buildroot/package/tinyxml/Config.in
similarity index 100%
rename from software/package/tinyxml/Config.in
rename to buildroot/package/tinyxml/Config.in
diff --git a/software/package/tinyxml/tinyxml.hash b/buildroot/package/tinyxml/tinyxml.hash
similarity index 100%
rename from software/package/tinyxml/tinyxml.hash
rename to buildroot/package/tinyxml/tinyxml.hash
diff --git a/software/package/tinyxml/tinyxml.mk b/buildroot/package/tinyxml/tinyxml.mk
similarity index 100%
rename from software/package/tinyxml/tinyxml.mk
rename to buildroot/package/tinyxml/tinyxml.mk
diff --git a/software/package/tinyxml2/Config.in b/buildroot/package/tinyxml2/Config.in
similarity index 100%
rename from software/package/tinyxml2/Config.in
rename to buildroot/package/tinyxml2/Config.in
diff --git a/software/package/tinyxml2/tinyxml2.hash b/buildroot/package/tinyxml2/tinyxml2.hash
similarity index 100%
rename from software/package/tinyxml2/tinyxml2.hash
rename to buildroot/package/tinyxml2/tinyxml2.hash
diff --git a/software/package/tinyxml2/tinyxml2.mk b/buildroot/package/tinyxml2/tinyxml2.mk
similarity index 100%
rename from software/package/tinyxml2/tinyxml2.mk
rename to buildroot/package/tinyxml2/tinyxml2.mk
diff --git a/software/package/tio/Config.in b/buildroot/package/tio/Config.in
similarity index 100%
rename from software/package/tio/Config.in
rename to buildroot/package/tio/Config.in
diff --git a/software/package/tio/tio.hash b/buildroot/package/tio/tio.hash
similarity index 100%
rename from software/package/tio/tio.hash
rename to buildroot/package/tio/tio.hash
diff --git a/software/package/tio/tio.mk b/buildroot/package/tio/tio.mk
similarity index 100%
rename from software/package/tio/tio.mk
rename to buildroot/package/tio/tio.mk
diff --git a/software/package/tk/Config.in b/buildroot/package/tk/Config.in
similarity index 100%
rename from software/package/tk/Config.in
rename to buildroot/package/tk/Config.in
diff --git a/software/package/tk/tk.hash b/buildroot/package/tk/tk.hash
similarity index 100%
rename from software/package/tk/tk.hash
rename to buildroot/package/tk/tk.hash
diff --git a/software/package/tk/tk.mk b/buildroot/package/tk/tk.mk
similarity index 100%
rename from software/package/tk/tk.mk
rename to buildroot/package/tk/tk.mk
diff --git a/software/package/tmux/Config.in b/buildroot/package/tmux/Config.in
similarity index 100%
rename from software/package/tmux/Config.in
rename to buildroot/package/tmux/Config.in
diff --git a/software/package/tmux/tmux.hash b/buildroot/package/tmux/tmux.hash
similarity index 100%
rename from software/package/tmux/tmux.hash
rename to buildroot/package/tmux/tmux.hash
diff --git a/software/package/tmux/tmux.mk b/buildroot/package/tmux/tmux.mk
similarity index 100%
rename from software/package/tmux/tmux.mk
rename to buildroot/package/tmux/tmux.mk
diff --git a/software/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
similarity index 100%
rename from software/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
rename to buildroot/package/tor/0001-Fix-static-linking-with-OpenSSL.patch
diff --git a/software/package/tor/Config.in b/buildroot/package/tor/Config.in
similarity index 100%
rename from software/package/tor/Config.in
rename to buildroot/package/tor/Config.in
diff --git a/software/package/tor/tor.hash b/buildroot/package/tor/tor.hash
similarity index 100%
rename from software/package/tor/tor.hash
rename to buildroot/package/tor/tor.hash
diff --git a/software/package/tor/tor.mk b/buildroot/package/tor/tor.mk
similarity index 100%
rename from software/package/tor/tor.mk
rename to buildroot/package/tor/tor.mk
diff --git a/software/package/tovid/0001-manpage.patch b/buildroot/package/tovid/0001-manpage.patch
similarity index 100%
rename from software/package/tovid/0001-manpage.patch
rename to buildroot/package/tovid/0001-manpage.patch
diff --git a/software/package/tovid/Config.in b/buildroot/package/tovid/Config.in
similarity index 100%
rename from software/package/tovid/Config.in
rename to buildroot/package/tovid/Config.in
diff --git a/software/package/tovid/tovid.hash b/buildroot/package/tovid/tovid.hash
similarity index 100%
rename from software/package/tovid/tovid.hash
rename to buildroot/package/tovid/tovid.hash
diff --git a/software/package/tovid/tovid.mk b/buildroot/package/tovid/tovid.mk
similarity index 100%
rename from software/package/tovid/tovid.mk
rename to buildroot/package/tovid/tovid.mk
diff --git a/software/package/tpm-tools/Config.in b/buildroot/package/tpm-tools/Config.in
similarity index 100%
rename from software/package/tpm-tools/Config.in
rename to buildroot/package/tpm-tools/Config.in
diff --git a/software/package/tpm-tools/tpm-tools.hash b/buildroot/package/tpm-tools/tpm-tools.hash
similarity index 100%
rename from software/package/tpm-tools/tpm-tools.hash
rename to buildroot/package/tpm-tools/tpm-tools.hash
diff --git a/software/package/tpm-tools/tpm-tools.mk b/buildroot/package/tpm-tools/tpm-tools.mk
similarity index 100%
rename from software/package/tpm-tools/tpm-tools.mk
rename to buildroot/package/tpm-tools/tpm-tools.mk
diff --git a/software/package/tpm2-abrmd/Config.in b/buildroot/package/tpm2-abrmd/Config.in
similarity index 100%
rename from software/package/tpm2-abrmd/Config.in
rename to buildroot/package/tpm2-abrmd/Config.in
diff --git a/software/package/tpm2-abrmd/S80tpm2-abrmd b/buildroot/package/tpm2-abrmd/S80tpm2-abrmd
similarity index 100%
rename from software/package/tpm2-abrmd/S80tpm2-abrmd
rename to buildroot/package/tpm2-abrmd/S80tpm2-abrmd
diff --git a/software/package/tpm2-abrmd/tpm2-abrmd.hash b/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash
similarity index 100%
rename from software/package/tpm2-abrmd/tpm2-abrmd.hash
rename to buildroot/package/tpm2-abrmd/tpm2-abrmd.hash
diff --git a/software/package/tpm2-abrmd/tpm2-abrmd.mk b/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk
similarity index 100%
rename from software/package/tpm2-abrmd/tpm2-abrmd.mk
rename to buildroot/package/tpm2-abrmd/tpm2-abrmd.mk
diff --git a/software/package/tpm2-tools/Config.in b/buildroot/package/tpm2-tools/Config.in
similarity index 100%
rename from software/package/tpm2-tools/Config.in
rename to buildroot/package/tpm2-tools/Config.in
diff --git a/software/package/tpm2-tools/tpm2-tools.hash b/buildroot/package/tpm2-tools/tpm2-tools.hash
similarity index 100%
rename from software/package/tpm2-tools/tpm2-tools.hash
rename to buildroot/package/tpm2-tools/tpm2-tools.hash
diff --git a/software/package/tpm2-tools/tpm2-tools.mk b/buildroot/package/tpm2-tools/tpm2-tools.mk
similarity index 100%
rename from software/package/tpm2-tools/tpm2-tools.mk
rename to buildroot/package/tpm2-tools/tpm2-tools.mk
diff --git a/software/package/tpm2-totp/Config.in b/buildroot/package/tpm2-totp/Config.in
similarity index 100%
rename from software/package/tpm2-totp/Config.in
rename to buildroot/package/tpm2-totp/Config.in
diff --git a/software/package/tpm2-totp/tpm2-totp.hash b/buildroot/package/tpm2-totp/tpm2-totp.hash
similarity index 100%
rename from software/package/tpm2-totp/tpm2-totp.hash
rename to buildroot/package/tpm2-totp/tpm2-totp.hash
diff --git a/software/package/tpm2-totp/tpm2-totp.mk b/buildroot/package/tpm2-totp/tpm2-totp.mk
similarity index 100%
rename from software/package/tpm2-totp/tpm2-totp.mk
rename to buildroot/package/tpm2-totp/tpm2-totp.mk
diff --git a/software/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch b/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
similarity index 100%
rename from software/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
rename to buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch
diff --git a/software/package/tpm2-tss/Config.in b/buildroot/package/tpm2-tss/Config.in
similarity index 100%
rename from software/package/tpm2-tss/Config.in
rename to buildroot/package/tpm2-tss/Config.in
diff --git a/software/package/tpm2-tss/tpm2-tss.hash b/buildroot/package/tpm2-tss/tpm2-tss.hash
similarity index 100%
rename from software/package/tpm2-tss/tpm2-tss.hash
rename to buildroot/package/tpm2-tss/tpm2-tss.hash
diff --git a/software/package/tpm2-tss/tpm2-tss.mk b/buildroot/package/tpm2-tss/tpm2-tss.mk
similarity index 100%
rename from software/package/tpm2-tss/tpm2-tss.mk
rename to buildroot/package/tpm2-tss/tpm2-tss.mk
diff --git a/software/package/trace-cmd/0001-trace-listen-add-missing-header.patch b/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch
similarity index 100%
rename from software/package/trace-cmd/0001-trace-listen-add-missing-header.patch
rename to buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch
diff --git a/software/package/trace-cmd/Config.in b/buildroot/package/trace-cmd/Config.in
similarity index 100%
rename from software/package/trace-cmd/Config.in
rename to buildroot/package/trace-cmd/Config.in
diff --git a/software/package/trace-cmd/trace-cmd.hash b/buildroot/package/trace-cmd/trace-cmd.hash
similarity index 100%
rename from software/package/trace-cmd/trace-cmd.hash
rename to buildroot/package/trace-cmd/trace-cmd.hash
diff --git a/software/package/trace-cmd/trace-cmd.mk b/buildroot/package/trace-cmd/trace-cmd.mk
similarity index 100%
rename from software/package/trace-cmd/trace-cmd.mk
rename to buildroot/package/trace-cmd/trace-cmd.mk
diff --git a/software/package/traceroute/Config.in b/buildroot/package/traceroute/Config.in
similarity index 100%
rename from software/package/traceroute/Config.in
rename to buildroot/package/traceroute/Config.in
diff --git a/software/package/traceroute/traceroute.hash b/buildroot/package/traceroute/traceroute.hash
similarity index 100%
rename from software/package/traceroute/traceroute.hash
rename to buildroot/package/traceroute/traceroute.hash
diff --git a/software/package/traceroute/traceroute.mk b/buildroot/package/traceroute/traceroute.mk
similarity index 100%
rename from software/package/traceroute/traceroute.mk
rename to buildroot/package/traceroute/traceroute.mk
diff --git a/software/package/transmission/0001-fix-utypes.patch b/buildroot/package/transmission/0001-fix-utypes.patch
similarity index 100%
rename from software/package/transmission/0001-fix-utypes.patch
rename to buildroot/package/transmission/0001-fix-utypes.patch
diff --git a/software/package/transmission/0002-musl-missing-header.patch b/buildroot/package/transmission/0002-musl-missing-header.patch
similarity index 100%
rename from software/package/transmission/0002-musl-missing-header.patch
rename to buildroot/package/transmission/0002-musl-missing-header.patch
diff --git a/software/package/transmission/0003-fix-utp-include.patch b/buildroot/package/transmission/0003-fix-utp-include.patch
similarity index 100%
rename from software/package/transmission/0003-fix-utp-include.patch
rename to buildroot/package/transmission/0003-fix-utp-include.patch
diff --git a/software/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/buildroot/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
similarity index 100%
rename from software/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
rename to buildroot/package/transmission/0004-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
diff --git a/software/package/transmission/0005-libsystemd.patch b/buildroot/package/transmission/0005-libsystemd.patch
similarity index 100%
rename from software/package/transmission/0005-libsystemd.patch
rename to buildroot/package/transmission/0005-libsystemd.patch
diff --git a/software/package/transmission/Config.in b/buildroot/package/transmission/Config.in
similarity index 100%
rename from software/package/transmission/Config.in
rename to buildroot/package/transmission/Config.in
diff --git a/software/package/transmission/S92transmission b/buildroot/package/transmission/S92transmission
similarity index 100%
rename from software/package/transmission/S92transmission
rename to buildroot/package/transmission/S92transmission
diff --git a/software/package/transmission/transmission.hash b/buildroot/package/transmission/transmission.hash
similarity index 100%
rename from software/package/transmission/transmission.hash
rename to buildroot/package/transmission/transmission.hash
diff --git a/software/package/transmission/transmission.mk b/buildroot/package/transmission/transmission.mk
similarity index 100%
rename from software/package/transmission/transmission.mk
rename to buildroot/package/transmission/transmission.mk
diff --git a/software/package/tree/Config.in b/buildroot/package/tree/Config.in
similarity index 100%
rename from software/package/tree/Config.in
rename to buildroot/package/tree/Config.in
diff --git a/software/package/tree/tree.hash b/buildroot/package/tree/tree.hash
similarity index 100%
rename from software/package/tree/tree.hash
rename to buildroot/package/tree/tree.hash
diff --git a/software/package/tree/tree.mk b/buildroot/package/tree/tree.mk
similarity index 100%
rename from software/package/tree/tree.mk
rename to buildroot/package/tree/tree.mk
diff --git a/software/package/tremor/Config.in b/buildroot/package/tremor/Config.in
similarity index 100%
rename from software/package/tremor/Config.in
rename to buildroot/package/tremor/Config.in
diff --git a/software/package/tremor/tremor.hash b/buildroot/package/tremor/tremor.hash
similarity index 100%
rename from software/package/tremor/tremor.hash
rename to buildroot/package/tremor/tremor.hash
diff --git a/software/package/tremor/tremor.mk b/buildroot/package/tremor/tremor.mk
similarity index 100%
rename from software/package/tremor/tremor.mk
rename to buildroot/package/tremor/tremor.mk
diff --git a/software/package/triggerhappy/Config.in b/buildroot/package/triggerhappy/Config.in
similarity index 100%
rename from software/package/triggerhappy/Config.in
rename to buildroot/package/triggerhappy/Config.in
diff --git a/software/package/triggerhappy/S10triggerhappy b/buildroot/package/triggerhappy/S10triggerhappy
similarity index 100%
rename from software/package/triggerhappy/S10triggerhappy
rename to buildroot/package/triggerhappy/S10triggerhappy
diff --git a/software/package/triggerhappy/triggerhappy.hash b/buildroot/package/triggerhappy/triggerhappy.hash
similarity index 100%
rename from software/package/triggerhappy/triggerhappy.hash
rename to buildroot/package/triggerhappy/triggerhappy.hash
diff --git a/software/package/triggerhappy/triggerhappy.mk b/buildroot/package/triggerhappy/triggerhappy.mk
similarity index 100%
rename from software/package/triggerhappy/triggerhappy.mk
rename to buildroot/package/triggerhappy/triggerhappy.mk
diff --git a/software/package/triggerhappy/triggerhappy.service b/buildroot/package/triggerhappy/triggerhappy.service
similarity index 100%
rename from software/package/triggerhappy/triggerhappy.service
rename to buildroot/package/triggerhappy/triggerhappy.service
diff --git a/software/package/trinity/Config.in b/buildroot/package/trinity/Config.in
similarity index 100%
rename from software/package/trinity/Config.in
rename to buildroot/package/trinity/Config.in
diff --git a/software/package/trinity/trinity.hash b/buildroot/package/trinity/trinity.hash
similarity index 100%
rename from software/package/trinity/trinity.hash
rename to buildroot/package/trinity/trinity.hash
diff --git a/software/package/trinity/trinity.mk b/buildroot/package/trinity/trinity.mk
similarity index 100%
rename from software/package/trinity/trinity.mk
rename to buildroot/package/trinity/trinity.mk
diff --git a/software/package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch b/buildroot/package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch
similarity index 100%
rename from software/package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch
rename to buildroot/package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch
diff --git a/software/package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch b/buildroot/package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch
similarity index 100%
rename from software/package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch
rename to buildroot/package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch
diff --git a/software/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch b/buildroot/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch
similarity index 100%
rename from software/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch
rename to buildroot/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch
diff --git a/software/package/trousers/Config.in b/buildroot/package/trousers/Config.in
similarity index 100%
rename from software/package/trousers/Config.in
rename to buildroot/package/trousers/Config.in
diff --git a/software/package/trousers/trousers.hash b/buildroot/package/trousers/trousers.hash
similarity index 100%
rename from software/package/trousers/trousers.hash
rename to buildroot/package/trousers/trousers.hash
diff --git a/software/package/trousers/trousers.mk b/buildroot/package/trousers/trousers.mk
similarity index 100%
rename from software/package/trousers/trousers.mk
rename to buildroot/package/trousers/trousers.mk
diff --git a/software/package/ts4900-fpga/Config.in b/buildroot/package/ts4900-fpga/Config.in
similarity index 100%
rename from software/package/ts4900-fpga/Config.in
rename to buildroot/package/ts4900-fpga/Config.in
diff --git a/software/package/ts4900-fpga/ts4900-fpga.hash b/buildroot/package/ts4900-fpga/ts4900-fpga.hash
similarity index 100%
rename from software/package/ts4900-fpga/ts4900-fpga.hash
rename to buildroot/package/ts4900-fpga/ts4900-fpga.hash
diff --git a/software/package/ts4900-fpga/ts4900-fpga.mk b/buildroot/package/ts4900-fpga/ts4900-fpga.mk
similarity index 100%
rename from software/package/ts4900-fpga/ts4900-fpga.mk
rename to buildroot/package/ts4900-fpga/ts4900-fpga.mk
diff --git a/software/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
similarity index 100%
rename from software/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
rename to buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff --git a/software/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch b/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch
similarity index 100%
rename from software/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch
rename to buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch
diff --git a/software/package/tslib/Config.in b/buildroot/package/tslib/Config.in
similarity index 100%
rename from software/package/tslib/Config.in
rename to buildroot/package/tslib/Config.in
diff --git a/software/package/tslib/tslib.hash b/buildroot/package/tslib/tslib.hash
similarity index 100%
rename from software/package/tslib/tslib.hash
rename to buildroot/package/tslib/tslib.hash
diff --git a/software/package/tslib/tslib.mk b/buildroot/package/tslib/tslib.mk
similarity index 100%
rename from software/package/tslib/tslib.mk
rename to buildroot/package/tslib/tslib.mk
diff --git a/software/package/tstools/0001-build-get-along-with-buildroot.patch b/buildroot/package/tstools/0001-build-get-along-with-buildroot.patch
similarity index 100%
rename from software/package/tstools/0001-build-get-along-with-buildroot.patch
rename to buildroot/package/tstools/0001-build-get-along-with-buildroot.patch
diff --git a/software/package/tstools/Config.in b/buildroot/package/tstools/Config.in
similarity index 100%
rename from software/package/tstools/Config.in
rename to buildroot/package/tstools/Config.in
diff --git a/software/package/tstools/tstools.hash b/buildroot/package/tstools/tstools.hash
similarity index 100%
rename from software/package/tstools/tstools.hash
rename to buildroot/package/tstools/tstools.hash
diff --git a/software/package/tstools/tstools.mk b/buildroot/package/tstools/tstools.mk
similarity index 100%
rename from software/package/tstools/tstools.mk
rename to buildroot/package/tstools/tstools.mk
diff --git a/software/package/tunctl/Config.in b/buildroot/package/tunctl/Config.in
similarity index 100%
rename from software/package/tunctl/Config.in
rename to buildroot/package/tunctl/Config.in
diff --git a/software/package/tunctl/tunctl.hash b/buildroot/package/tunctl/tunctl.hash
similarity index 100%
rename from software/package/tunctl/tunctl.hash
rename to buildroot/package/tunctl/tunctl.hash
diff --git a/software/package/tunctl/tunctl.mk b/buildroot/package/tunctl/tunctl.mk
similarity index 100%
rename from software/package/tunctl/tunctl.mk
rename to buildroot/package/tunctl/tunctl.mk
diff --git a/software/package/turbolua/Config.in b/buildroot/package/turbolua/Config.in
similarity index 100%
rename from software/package/turbolua/Config.in
rename to buildroot/package/turbolua/Config.in
diff --git a/software/package/turbolua/turbolua.hash b/buildroot/package/turbolua/turbolua.hash
similarity index 100%
rename from software/package/turbolua/turbolua.hash
rename to buildroot/package/turbolua/turbolua.hash
diff --git a/software/package/turbolua/turbolua.mk b/buildroot/package/turbolua/turbolua.mk
similarity index 100%
rename from software/package/turbolua/turbolua.mk
rename to buildroot/package/turbolua/turbolua.mk
diff --git a/software/package/tvheadend/0001-no-check_config.patch b/buildroot/package/tvheadend/0001-no-check_config.patch
similarity index 100%
rename from software/package/tvheadend/0001-no-check_config.patch
rename to buildroot/package/tvheadend/0001-no-check_config.patch
diff --git a/software/package/tvheadend/Config.in b/buildroot/package/tvheadend/Config.in
similarity index 100%
rename from software/package/tvheadend/Config.in
rename to buildroot/package/tvheadend/Config.in
diff --git a/software/package/tvheadend/S99tvheadend b/buildroot/package/tvheadend/S99tvheadend
similarity index 100%
rename from software/package/tvheadend/S99tvheadend
rename to buildroot/package/tvheadend/S99tvheadend
diff --git a/software/package/tvheadend/etc.default.tvheadend b/buildroot/package/tvheadend/etc.default.tvheadend
similarity index 100%
rename from software/package/tvheadend/etc.default.tvheadend
rename to buildroot/package/tvheadend/etc.default.tvheadend
diff --git a/software/package/tvheadend/tvheadend.hash b/buildroot/package/tvheadend/tvheadend.hash
similarity index 100%
rename from software/package/tvheadend/tvheadend.hash
rename to buildroot/package/tvheadend/tvheadend.hash
diff --git a/software/package/tvheadend/tvheadend.mk b/buildroot/package/tvheadend/tvheadend.mk
similarity index 100%
rename from software/package/tvheadend/tvheadend.mk
rename to buildroot/package/tvheadend/tvheadend.mk
diff --git a/software/package/twolame/Config.in b/buildroot/package/twolame/Config.in
similarity index 100%
rename from software/package/twolame/Config.in
rename to buildroot/package/twolame/Config.in
diff --git a/software/package/twolame/twolame.hash b/buildroot/package/twolame/twolame.hash
similarity index 100%
rename from software/package/twolame/twolame.hash
rename to buildroot/package/twolame/twolame.hash
diff --git a/software/package/twolame/twolame.mk b/buildroot/package/twolame/twolame.mk
similarity index 100%
rename from software/package/twolame/twolame.mk
rename to buildroot/package/twolame/twolame.mk
diff --git a/software/package/tz/Config.in b/buildroot/package/tz/Config.in
similarity index 100%
rename from software/package/tz/Config.in
rename to buildroot/package/tz/Config.in
diff --git a/software/package/tz/tz.mk b/buildroot/package/tz/tz.mk
similarity index 100%
rename from software/package/tz/tz.mk
rename to buildroot/package/tz/tz.mk
diff --git a/software/package/tzdata/Config.in b/buildroot/package/tzdata/Config.in
similarity index 100%
rename from software/package/tzdata/Config.in
rename to buildroot/package/tzdata/Config.in
diff --git a/software/package/tzdata/tzdata.hash b/buildroot/package/tzdata/tzdata.hash
similarity index 100%
rename from software/package/tzdata/tzdata.hash
rename to buildroot/package/tzdata/tzdata.hash
diff --git a/software/package/tzdata/tzdata.mk b/buildroot/package/tzdata/tzdata.mk
similarity index 100%
rename from software/package/tzdata/tzdata.mk
rename to buildroot/package/tzdata/tzdata.mk
diff --git a/software/package/tzdump/tzdump.hash b/buildroot/package/tzdump/tzdump.hash
similarity index 100%
rename from software/package/tzdump/tzdump.hash
rename to buildroot/package/tzdump/tzdump.hash
diff --git a/software/package/tzdump/tzdump.mk b/buildroot/package/tzdump/tzdump.mk
similarity index 100%
rename from software/package/tzdump/tzdump.mk
rename to buildroot/package/tzdump/tzdump.mk
diff --git a/software/package/uacme/Config.in b/buildroot/package/uacme/Config.in
similarity index 100%
rename from software/package/uacme/Config.in
rename to buildroot/package/uacme/Config.in
diff --git a/software/package/uacme/uacme.hash b/buildroot/package/uacme/uacme.hash
similarity index 100%
rename from software/package/uacme/uacme.hash
rename to buildroot/package/uacme/uacme.hash
diff --git a/software/package/uacme/uacme.mk b/buildroot/package/uacme/uacme.mk
similarity index 100%
rename from software/package/uacme/uacme.mk
rename to buildroot/package/uacme/uacme.mk
diff --git a/software/package/uboot-tools/0001-drop-configh-from-tools.patch b/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch
similarity index 100%
rename from software/package/uboot-tools/0001-drop-configh-from-tools.patch
rename to buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch
diff --git a/software/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch
similarity index 100%
rename from software/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch
rename to buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch
diff --git a/software/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch b/buildroot/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch
similarity index 100%
rename from software/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch
rename to buildroot/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch
diff --git a/software/package/uboot-tools/Config.in b/buildroot/package/uboot-tools/Config.in
similarity index 100%
rename from software/package/uboot-tools/Config.in
rename to buildroot/package/uboot-tools/Config.in
diff --git a/software/package/uboot-tools/Config.in.host b/buildroot/package/uboot-tools/Config.in.host
similarity index 100%
rename from software/package/uboot-tools/Config.in.host
rename to buildroot/package/uboot-tools/Config.in.host
diff --git a/software/package/uboot-tools/uboot-tools.hash b/buildroot/package/uboot-tools/uboot-tools.hash
similarity index 100%
rename from software/package/uboot-tools/uboot-tools.hash
rename to buildroot/package/uboot-tools/uboot-tools.hash
diff --git a/software/package/uboot-tools/uboot-tools.mk b/buildroot/package/uboot-tools/uboot-tools.mk
similarity index 100%
rename from software/package/uboot-tools/uboot-tools.mk
rename to buildroot/package/uboot-tools/uboot-tools.mk
diff --git a/software/package/ubus/0001-Install-server-and-client-examples.patch b/buildroot/package/ubus/0001-Install-server-and-client-examples.patch
similarity index 100%
rename from software/package/ubus/0001-Install-server-and-client-examples.patch
rename to buildroot/package/ubus/0001-Install-server-and-client-examples.patch
diff --git a/software/package/ubus/Config.in b/buildroot/package/ubus/Config.in
similarity index 100%
rename from software/package/ubus/Config.in
rename to buildroot/package/ubus/Config.in
diff --git a/software/package/ubus/ubus.hash b/buildroot/package/ubus/ubus.hash
similarity index 100%
rename from software/package/ubus/ubus.hash
rename to buildroot/package/ubus/ubus.hash
diff --git a/software/package/ubus/ubus.mk b/buildroot/package/ubus/ubus.mk
similarity index 100%
rename from software/package/ubus/ubus.mk
rename to buildroot/package/ubus/ubus.mk
diff --git a/software/package/uccp420wlan/Config.in b/buildroot/package/uccp420wlan/Config.in
similarity index 100%
rename from software/package/uccp420wlan/Config.in
rename to buildroot/package/uccp420wlan/Config.in
diff --git a/software/package/uccp420wlan/uccp420wlan.hash b/buildroot/package/uccp420wlan/uccp420wlan.hash
similarity index 100%
rename from software/package/uccp420wlan/uccp420wlan.hash
rename to buildroot/package/uccp420wlan/uccp420wlan.hash
diff --git a/software/package/uccp420wlan/uccp420wlan.mk b/buildroot/package/uccp420wlan/uccp420wlan.mk
similarity index 100%
rename from software/package/uccp420wlan/uccp420wlan.mk
rename to buildroot/package/uccp420wlan/uccp420wlan.mk
diff --git a/software/package/ucl/ucl.hash b/buildroot/package/ucl/ucl.hash
similarity index 100%
rename from software/package/ucl/ucl.hash
rename to buildroot/package/ucl/ucl.hash
diff --git a/software/package/ucl/ucl.mk b/buildroot/package/ucl/ucl.mk
similarity index 100%
rename from software/package/ucl/ucl.mk
rename to buildroot/package/ucl/ucl.mk
diff --git a/software/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch b/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch
similarity index 100%
rename from software/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch
rename to buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch
diff --git a/software/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch b/buildroot/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch
similarity index 100%
rename from software/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch
rename to buildroot/package/uclibc-ng-test/0002-Add-NO_CRYPT-to-fix-build-with-glibc-2.28.patch
diff --git a/software/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch b/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch
similarity index 100%
rename from software/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch
rename to buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch
diff --git a/software/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch b/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch
similarity index 100%
rename from software/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch
rename to buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch
diff --git a/software/package/uclibc-ng-test/Config.in b/buildroot/package/uclibc-ng-test/Config.in
similarity index 100%
rename from software/package/uclibc-ng-test/Config.in
rename to buildroot/package/uclibc-ng-test/Config.in
diff --git a/software/package/uclibc-ng-test/uclibc-ng-test.mk b/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk
similarity index 100%
rename from software/package/uclibc-ng-test/uclibc-ng-test.mk
rename to buildroot/package/uclibc-ng-test/uclibc-ng-test.mk
diff --git a/software/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch b/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
similarity index 100%
rename from software/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
rename to buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch
diff --git a/software/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch b/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch
similarity index 100%
rename from software/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch
rename to buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch
diff --git a/software/package/uclibc/Config.in b/buildroot/package/uclibc/Config.in
similarity index 100%
rename from software/package/uclibc/Config.in
rename to buildroot/package/uclibc/Config.in
diff --git a/software/package/uclibc/uClibc-ng.config b/buildroot/package/uclibc/uClibc-ng.config
similarity index 100%
rename from software/package/uclibc/uClibc-ng.config
rename to buildroot/package/uclibc/uClibc-ng.config
diff --git a/software/package/uclibc/uclibc.hash b/buildroot/package/uclibc/uclibc.hash
similarity index 100%
rename from software/package/uclibc/uclibc.hash
rename to buildroot/package/uclibc/uclibc.hash
diff --git a/software/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk
similarity index 100%
rename from software/package/uclibc/uclibc.mk
rename to buildroot/package/uclibc/uclibc.mk
diff --git a/software/package/udev/Config.in b/buildroot/package/udev/Config.in
similarity index 100%
rename from software/package/udev/Config.in
rename to buildroot/package/udev/Config.in
diff --git a/software/package/udev/udev.mk b/buildroot/package/udev/udev.mk
similarity index 100%
rename from software/package/udev/udev.mk
rename to buildroot/package/udev/udev.mk
diff --git a/software/package/udftools/Config.in b/buildroot/package/udftools/Config.in
similarity index 100%
rename from software/package/udftools/Config.in
rename to buildroot/package/udftools/Config.in
diff --git a/software/package/udftools/udftools.hash b/buildroot/package/udftools/udftools.hash
similarity index 100%
rename from software/package/udftools/udftools.hash
rename to buildroot/package/udftools/udftools.hash
diff --git a/software/package/udftools/udftools.mk b/buildroot/package/udftools/udftools.mk
similarity index 100%
rename from software/package/udftools/udftools.mk
rename to buildroot/package/udftools/udftools.mk
diff --git a/software/package/udisks/0001-fix-build-with-newer-glibc-versions.patch b/buildroot/package/udisks/0001-fix-build-with-newer-glibc-versions.patch
similarity index 100%
rename from software/package/udisks/0001-fix-build-with-newer-glibc-versions.patch
rename to buildroot/package/udisks/0001-fix-build-with-newer-glibc-versions.patch
diff --git a/software/package/udisks/0002-Fix-systemd-service-file.patch b/buildroot/package/udisks/0002-Fix-systemd-service-file.patch
similarity index 100%
rename from software/package/udisks/0002-Fix-systemd-service-file.patch
rename to buildroot/package/udisks/0002-Fix-systemd-service-file.patch
diff --git a/software/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch b/buildroot/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch
similarity index 100%
rename from software/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch
rename to buildroot/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch
diff --git a/software/package/udisks/Config.in b/buildroot/package/udisks/Config.in
similarity index 100%
rename from software/package/udisks/Config.in
rename to buildroot/package/udisks/Config.in
diff --git a/software/package/udisks/udisks.hash b/buildroot/package/udisks/udisks.hash
similarity index 100%
rename from software/package/udisks/udisks.hash
rename to buildroot/package/udisks/udisks.hash
diff --git a/software/package/udisks/udisks.mk b/buildroot/package/udisks/udisks.mk
similarity index 100%
rename from software/package/udisks/udisks.mk
rename to buildroot/package/udisks/udisks.mk
diff --git a/software/package/udpcast/0001-select-h.patch b/buildroot/package/udpcast/0001-select-h.patch
similarity index 100%
rename from software/package/udpcast/0001-select-h.patch
rename to buildroot/package/udpcast/0001-select-h.patch
diff --git a/software/package/udpcast/Config.in b/buildroot/package/udpcast/Config.in
similarity index 100%
rename from software/package/udpcast/Config.in
rename to buildroot/package/udpcast/Config.in
diff --git a/software/package/udpcast/udpcast.hash b/buildroot/package/udpcast/udpcast.hash
similarity index 100%
rename from software/package/udpcast/udpcast.hash
rename to buildroot/package/udpcast/udpcast.hash
diff --git a/software/package/udpcast/udpcast.mk b/buildroot/package/udpcast/udpcast.mk
similarity index 100%
rename from software/package/udpcast/udpcast.mk
rename to buildroot/package/udpcast/udpcast.mk
diff --git a/software/package/udpxy/Config.in b/buildroot/package/udpxy/Config.in
similarity index 100%
rename from software/package/udpxy/Config.in
rename to buildroot/package/udpxy/Config.in
diff --git a/software/package/udpxy/udpxy.hash b/buildroot/package/udpxy/udpxy.hash
similarity index 100%
rename from software/package/udpxy/udpxy.hash
rename to buildroot/package/udpxy/udpxy.hash
diff --git a/software/package/udpxy/udpxy.mk b/buildroot/package/udpxy/udpxy.mk
similarity index 100%
rename from software/package/udpxy/udpxy.mk
rename to buildroot/package/udpxy/udpxy.mk
diff --git a/software/package/uemacs/01-clear-ixon-termios-flag.patch b/buildroot/package/uemacs/01-clear-ixon-termios-flag.patch
similarity index 100%
rename from software/package/uemacs/01-clear-ixon-termios-flag.patch
rename to buildroot/package/uemacs/01-clear-ixon-termios-flag.patch
diff --git a/software/package/uemacs/Config.in b/buildroot/package/uemacs/Config.in
similarity index 100%
rename from software/package/uemacs/Config.in
rename to buildroot/package/uemacs/Config.in
diff --git a/software/package/uemacs/uemacs.hash b/buildroot/package/uemacs/uemacs.hash
similarity index 100%
rename from software/package/uemacs/uemacs.hash
rename to buildroot/package/uemacs/uemacs.hash
diff --git a/software/package/uemacs/uemacs.mk b/buildroot/package/uemacs/uemacs.mk
similarity index 100%
rename from software/package/uemacs/uemacs.mk
rename to buildroot/package/uemacs/uemacs.mk
diff --git a/software/package/uftp/Config.in b/buildroot/package/uftp/Config.in
similarity index 100%
rename from software/package/uftp/Config.in
rename to buildroot/package/uftp/Config.in
diff --git a/software/package/uftp/uftp.hash b/buildroot/package/uftp/uftp.hash
similarity index 100%
rename from software/package/uftp/uftp.hash
rename to buildroot/package/uftp/uftp.hash
diff --git a/software/package/uftp/uftp.mk b/buildroot/package/uftp/uftp.mk
similarity index 100%
rename from software/package/uftp/uftp.mk
rename to buildroot/package/uftp/uftp.mk
diff --git a/software/package/uhttpd/0001-Remove-Werror.patch b/buildroot/package/uhttpd/0001-Remove-Werror.patch
similarity index 100%
rename from software/package/uhttpd/0001-Remove-Werror.patch
rename to buildroot/package/uhttpd/0001-Remove-Werror.patch
diff --git a/software/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch b/buildroot/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch
similarity index 100%
rename from software/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch
rename to buildroot/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch
diff --git a/software/package/uhttpd/Config.in b/buildroot/package/uhttpd/Config.in
similarity index 100%
rename from software/package/uhttpd/Config.in
rename to buildroot/package/uhttpd/Config.in
diff --git a/software/package/uhttpd/uhttpd.hash b/buildroot/package/uhttpd/uhttpd.hash
similarity index 100%
rename from software/package/uhttpd/uhttpd.hash
rename to buildroot/package/uhttpd/uhttpd.hash
diff --git a/software/package/uhttpd/uhttpd.mk b/buildroot/package/uhttpd/uhttpd.mk
similarity index 100%
rename from software/package/uhttpd/uhttpd.mk
rename to buildroot/package/uhttpd/uhttpd.mk
diff --git a/software/package/uhubctl/Config.in b/buildroot/package/uhubctl/Config.in
similarity index 100%
rename from software/package/uhubctl/Config.in
rename to buildroot/package/uhubctl/Config.in
diff --git a/software/package/uhubctl/uhubctl.hash b/buildroot/package/uhubctl/uhubctl.hash
similarity index 100%
rename from software/package/uhubctl/uhubctl.hash
rename to buildroot/package/uhubctl/uhubctl.hash
diff --git a/software/package/uhubctl/uhubctl.mk b/buildroot/package/uhubctl/uhubctl.mk
similarity index 100%
rename from software/package/uhubctl/uhubctl.mk
rename to buildroot/package/uhubctl/uhubctl.mk
diff --git a/software/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch b/buildroot/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch
similarity index 100%
rename from software/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch
rename to buildroot/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch
diff --git a/software/package/ulogd/Config.in b/buildroot/package/ulogd/Config.in
similarity index 100%
rename from software/package/ulogd/Config.in
rename to buildroot/package/ulogd/Config.in
diff --git a/software/package/ulogd/ulogd.hash b/buildroot/package/ulogd/ulogd.hash
similarity index 100%
rename from software/package/ulogd/ulogd.hash
rename to buildroot/package/ulogd/ulogd.hash
diff --git a/software/package/ulogd/ulogd.mk b/buildroot/package/ulogd/ulogd.mk
similarity index 100%
rename from software/package/ulogd/ulogd.mk
rename to buildroot/package/ulogd/ulogd.mk
diff --git a/software/package/umtprd/Config.in b/buildroot/package/umtprd/Config.in
similarity index 100%
rename from software/package/umtprd/Config.in
rename to buildroot/package/umtprd/Config.in
diff --git a/software/package/umtprd/umtprd.hash b/buildroot/package/umtprd/umtprd.hash
similarity index 100%
rename from software/package/umtprd/umtprd.hash
rename to buildroot/package/umtprd/umtprd.hash
diff --git a/software/package/umtprd/umtprd.mk b/buildroot/package/umtprd/umtprd.mk
similarity index 100%
rename from software/package/umtprd/umtprd.mk
rename to buildroot/package/umtprd/umtprd.mk
diff --git a/software/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch b/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
similarity index 100%
rename from software/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
rename to buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
diff --git a/software/package/unionfs/Config.in b/buildroot/package/unionfs/Config.in
similarity index 100%
rename from software/package/unionfs/Config.in
rename to buildroot/package/unionfs/Config.in
diff --git a/software/package/unionfs/unionfs.hash b/buildroot/package/unionfs/unionfs.hash
similarity index 100%
rename from software/package/unionfs/unionfs.hash
rename to buildroot/package/unionfs/unionfs.hash
diff --git a/software/package/unionfs/unionfs.mk b/buildroot/package/unionfs/unionfs.mk
similarity index 100%
rename from software/package/unionfs/unionfs.mk
rename to buildroot/package/unionfs/unionfs.mk
diff --git a/software/package/unixodbc/0001-fix-nopthread.patch b/buildroot/package/unixodbc/0001-fix-nopthread.patch
similarity index 100%
rename from software/package/unixodbc/0001-fix-nopthread.patch
rename to buildroot/package/unixodbc/0001-fix-nopthread.patch
diff --git a/software/package/unixodbc/Config.in b/buildroot/package/unixodbc/Config.in
similarity index 100%
rename from software/package/unixodbc/Config.in
rename to buildroot/package/unixodbc/Config.in
diff --git a/software/package/unixodbc/unixodbc.hash b/buildroot/package/unixodbc/unixodbc.hash
similarity index 100%
rename from software/package/unixodbc/unixodbc.hash
rename to buildroot/package/unixodbc/unixodbc.hash
diff --git a/software/package/unixodbc/unixodbc.mk b/buildroot/package/unixodbc/unixodbc.mk
similarity index 100%
rename from software/package/unixodbc/unixodbc.mk
rename to buildroot/package/unixodbc/unixodbc.mk
diff --git a/software/package/unrar/Config.in b/buildroot/package/unrar/Config.in
similarity index 100%
rename from software/package/unrar/Config.in
rename to buildroot/package/unrar/Config.in
diff --git a/software/package/unrar/unrar.hash b/buildroot/package/unrar/unrar.hash
similarity index 100%
rename from software/package/unrar/unrar.hash
rename to buildroot/package/unrar/unrar.hash
diff --git a/software/package/unrar/unrar.mk b/buildroot/package/unrar/unrar.mk
similarity index 100%
rename from software/package/unrar/unrar.mk
rename to buildroot/package/unrar/unrar.mk
diff --git a/software/package/unscd/Config.in b/buildroot/package/unscd/Config.in
similarity index 100%
rename from software/package/unscd/Config.in
rename to buildroot/package/unscd/Config.in
diff --git a/software/package/unscd/S46unscd b/buildroot/package/unscd/S46unscd
similarity index 100%
rename from software/package/unscd/S46unscd
rename to buildroot/package/unscd/S46unscd
diff --git a/software/package/unscd/nscd.conf b/buildroot/package/unscd/nscd.conf
similarity index 100%
rename from software/package/unscd/nscd.conf
rename to buildroot/package/unscd/nscd.conf
diff --git a/software/package/unscd/unscd.hash b/buildroot/package/unscd/unscd.hash
similarity index 100%
rename from software/package/unscd/unscd.hash
rename to buildroot/package/unscd/unscd.hash
diff --git a/software/package/unscd/unscd.mk b/buildroot/package/unscd/unscd.mk
similarity index 100%
rename from software/package/unscd/unscd.mk
rename to buildroot/package/unscd/unscd.mk
diff --git a/software/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch b/buildroot/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch
similarity index 100%
rename from software/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch
rename to buildroot/package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch
diff --git a/software/package/unzip/Config.in b/buildroot/package/unzip/Config.in
similarity index 100%
rename from software/package/unzip/Config.in
rename to buildroot/package/unzip/Config.in
diff --git a/software/package/unzip/unzip.hash b/buildroot/package/unzip/unzip.hash
similarity index 100%
rename from software/package/unzip/unzip.hash
rename to buildroot/package/unzip/unzip.hash
diff --git a/software/package/unzip/unzip.mk b/buildroot/package/unzip/unzip.mk
similarity index 100%
rename from software/package/unzip/unzip.mk
rename to buildroot/package/unzip/unzip.mk
diff --git a/software/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch b/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch
similarity index 100%
rename from software/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch
rename to buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch
diff --git a/software/package/upmpdcli/Config.in b/buildroot/package/upmpdcli/Config.in
similarity index 100%
rename from software/package/upmpdcli/Config.in
rename to buildroot/package/upmpdcli/Config.in
diff --git a/software/package/upmpdcli/S99upmpdcli b/buildroot/package/upmpdcli/S99upmpdcli
similarity index 100%
rename from software/package/upmpdcli/S99upmpdcli
rename to buildroot/package/upmpdcli/S99upmpdcli
diff --git a/software/package/upmpdcli/upmpdcli.hash b/buildroot/package/upmpdcli/upmpdcli.hash
similarity index 100%
rename from software/package/upmpdcli/upmpdcli.hash
rename to buildroot/package/upmpdcli/upmpdcli.hash
diff --git a/software/package/upmpdcli/upmpdcli.mk b/buildroot/package/upmpdcli/upmpdcli.mk
similarity index 100%
rename from software/package/upmpdcli/upmpdcli.mk
rename to buildroot/package/upmpdcli/upmpdcli.mk
diff --git a/software/package/upower/Config.in b/buildroot/package/upower/Config.in
similarity index 100%
rename from software/package/upower/Config.in
rename to buildroot/package/upower/Config.in
diff --git a/software/package/upower/upower.hash b/buildroot/package/upower/upower.hash
similarity index 100%
rename from software/package/upower/upower.hash
rename to buildroot/package/upower/upower.hash
diff --git a/software/package/upower/upower.mk b/buildroot/package/upower/upower.mk
similarity index 100%
rename from software/package/upower/upower.mk
rename to buildroot/package/upower/upower.mk
diff --git a/software/package/upx/upx.hash b/buildroot/package/upx/upx.hash
similarity index 100%
rename from software/package/upx/upx.hash
rename to buildroot/package/upx/upx.hash
diff --git a/software/package/upx/upx.mk b/buildroot/package/upx/upx.mk
similarity index 100%
rename from software/package/upx/upx.mk
rename to buildroot/package/upx/upx.mk
diff --git a/software/package/urg/0001-select-h.patch b/buildroot/package/urg/0001-select-h.patch
similarity index 100%
rename from software/package/urg/0001-select-h.patch
rename to buildroot/package/urg/0001-select-h.patch
diff --git a/software/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch b/buildroot/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch
similarity index 100%
rename from software/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch
rename to buildroot/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch
diff --git a/software/package/urg/Config.in b/buildroot/package/urg/Config.in
similarity index 100%
rename from software/package/urg/Config.in
rename to buildroot/package/urg/Config.in
diff --git a/software/package/urg/urg.hash b/buildroot/package/urg/urg.hash
similarity index 100%
rename from software/package/urg/urg.hash
rename to buildroot/package/urg/urg.hash
diff --git a/software/package/urg/urg.mk b/buildroot/package/urg/urg.mk
similarity index 100%
rename from software/package/urg/urg.mk
rename to buildroot/package/urg/urg.mk
diff --git a/software/package/usb_modeswitch/Config.in b/buildroot/package/usb_modeswitch/Config.in
similarity index 100%
rename from software/package/usb_modeswitch/Config.in
rename to buildroot/package/usb_modeswitch/Config.in
diff --git a/software/package/usb_modeswitch/usb_modeswitch.hash b/buildroot/package/usb_modeswitch/usb_modeswitch.hash
similarity index 100%
rename from software/package/usb_modeswitch/usb_modeswitch.hash
rename to buildroot/package/usb_modeswitch/usb_modeswitch.hash
diff --git a/software/package/usb_modeswitch/usb_modeswitch.mk b/buildroot/package/usb_modeswitch/usb_modeswitch.mk
similarity index 100%
rename from software/package/usb_modeswitch/usb_modeswitch.mk
rename to buildroot/package/usb_modeswitch/usb_modeswitch.mk
diff --git a/software/package/usb_modeswitch_data/Config.in b/buildroot/package/usb_modeswitch_data/Config.in
similarity index 100%
rename from software/package/usb_modeswitch_data/Config.in
rename to buildroot/package/usb_modeswitch_data/Config.in
diff --git a/software/package/usb_modeswitch_data/usb_modeswitch_data.hash b/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash
similarity index 100%
rename from software/package/usb_modeswitch_data/usb_modeswitch_data.hash
rename to buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash
diff --git a/software/package/usb_modeswitch_data/usb_modeswitch_data.mk b/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk
similarity index 100%
rename from software/package/usb_modeswitch_data/usb_modeswitch_data.mk
rename to buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk
diff --git a/software/package/usbmount/0001-rules-fix.patch b/buildroot/package/usbmount/0001-rules-fix.patch
similarity index 100%
rename from software/package/usbmount/0001-rules-fix.patch
rename to buildroot/package/usbmount/0001-rules-fix.patch
diff --git a/software/package/usbmount/0002-use-udev-environment-instead-of-blkid.patch b/buildroot/package/usbmount/0002-use-udev-environment-instead-of-blkid.patch
similarity index 100%
rename from software/package/usbmount/0002-use-udev-environment-instead-of-blkid.patch
rename to buildroot/package/usbmount/0002-use-udev-environment-instead-of-blkid.patch
diff --git a/software/package/usbmount/Config.in b/buildroot/package/usbmount/Config.in
similarity index 100%
rename from software/package/usbmount/Config.in
rename to buildroot/package/usbmount/Config.in
diff --git a/software/package/usbmount/usbmount.hash b/buildroot/package/usbmount/usbmount.hash
similarity index 100%
rename from software/package/usbmount/usbmount.hash
rename to buildroot/package/usbmount/usbmount.hash
diff --git a/software/package/usbmount/usbmount.mk b/buildroot/package/usbmount/usbmount.mk
similarity index 100%
rename from software/package/usbmount/usbmount.mk
rename to buildroot/package/usbmount/usbmount.mk
diff --git a/software/package/usbredir/Config.in b/buildroot/package/usbredir/Config.in
similarity index 100%
rename from software/package/usbredir/Config.in
rename to buildroot/package/usbredir/Config.in
diff --git a/software/package/usbredir/usbredir.hash b/buildroot/package/usbredir/usbredir.hash
similarity index 100%
rename from software/package/usbredir/usbredir.hash
rename to buildroot/package/usbredir/usbredir.hash
diff --git a/software/package/usbredir/usbredir.mk b/buildroot/package/usbredir/usbredir.mk
similarity index 100%
rename from software/package/usbredir/usbredir.mk
rename to buildroot/package/usbredir/usbredir.mk
diff --git a/software/package/usbutils/Config.in b/buildroot/package/usbutils/Config.in
similarity index 100%
rename from software/package/usbutils/Config.in
rename to buildroot/package/usbutils/Config.in
diff --git a/software/package/usbutils/usbutils.hash b/buildroot/package/usbutils/usbutils.hash
similarity index 100%
rename from software/package/usbutils/usbutils.hash
rename to buildroot/package/usbutils/usbutils.hash
diff --git a/software/package/usbutils/usbutils.mk b/buildroot/package/usbutils/usbutils.mk
similarity index 100%
rename from software/package/usbutils/usbutils.mk
rename to buildroot/package/usbutils/usbutils.mk
diff --git a/software/package/ushare/0001-compile-fixes.patch b/buildroot/package/ushare/0001-compile-fixes.patch
similarity index 100%
rename from software/package/ushare/0001-compile-fixes.patch
rename to buildroot/package/ushare/0001-compile-fixes.patch
diff --git a/software/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch b/buildroot/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch
similarity index 100%
rename from software/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch
rename to buildroot/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch
diff --git a/software/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch b/buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch
similarity index 100%
rename from software/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch
rename to buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch
diff --git a/software/package/ushare/Config.in b/buildroot/package/ushare/Config.in
similarity index 100%
rename from software/package/ushare/Config.in
rename to buildroot/package/ushare/Config.in
diff --git a/software/package/ushare/ushare.hash b/buildroot/package/ushare/ushare.hash
similarity index 100%
rename from software/package/ushare/ushare.hash
rename to buildroot/package/ushare/ushare.hash
diff --git a/software/package/ushare/ushare.mk b/buildroot/package/ushare/ushare.mk
similarity index 100%
rename from software/package/ushare/ushare.mk
rename to buildroot/package/ushare/ushare.mk
diff --git a/software/package/ussp-push/0001-fix-build-against-bluez-4.patch b/buildroot/package/ussp-push/0001-fix-build-against-bluez-4.patch
similarity index 100%
rename from software/package/ussp-push/0001-fix-build-against-bluez-4.patch
rename to buildroot/package/ussp-push/0001-fix-build-against-bluez-4.patch
diff --git a/software/package/ussp-push/0002-fix-build-again-obex-bluez.patch b/buildroot/package/ussp-push/0002-fix-build-again-obex-bluez.patch
similarity index 100%
rename from software/package/ussp-push/0002-fix-build-again-obex-bluez.patch
rename to buildroot/package/ussp-push/0002-fix-build-again-obex-bluez.patch
diff --git a/software/package/ussp-push/0003-add-OBEX_CharToUnicode.patch b/buildroot/package/ussp-push/0003-add-OBEX_CharToUnicode.patch
similarity index 100%
rename from software/package/ussp-push/0003-add-OBEX_CharToUnicode.patch
rename to buildroot/package/ussp-push/0003-add-OBEX_CharToUnicode.patch
diff --git a/software/package/ussp-push/Config.in b/buildroot/package/ussp-push/Config.in
similarity index 100%
rename from software/package/ussp-push/Config.in
rename to buildroot/package/ussp-push/Config.in
diff --git a/software/package/ussp-push/ussp-push.hash b/buildroot/package/ussp-push/ussp-push.hash
similarity index 100%
rename from software/package/ussp-push/ussp-push.hash
rename to buildroot/package/ussp-push/ussp-push.hash
diff --git a/software/package/ussp-push/ussp-push.mk b/buildroot/package/ussp-push/ussp-push.mk
similarity index 100%
rename from software/package/ussp-push/ussp-push.mk
rename to buildroot/package/ussp-push/ussp-push.mk
diff --git a/software/package/ustream-ssl/Config.in b/buildroot/package/ustream-ssl/Config.in
similarity index 100%
rename from software/package/ustream-ssl/Config.in
rename to buildroot/package/ustream-ssl/Config.in
diff --git a/software/package/ustream-ssl/ustream-ssl.hash b/buildroot/package/ustream-ssl/ustream-ssl.hash
similarity index 100%
rename from software/package/ustream-ssl/ustream-ssl.hash
rename to buildroot/package/ustream-ssl/ustream-ssl.hash
diff --git a/software/package/ustream-ssl/ustream-ssl.mk b/buildroot/package/ustream-ssl/ustream-ssl.mk
similarity index 100%
rename from software/package/ustream-ssl/ustream-ssl.mk
rename to buildroot/package/ustream-ssl/ustream-ssl.mk
diff --git a/software/package/utf8proc/Config.in b/buildroot/package/utf8proc/Config.in
similarity index 100%
rename from software/package/utf8proc/Config.in
rename to buildroot/package/utf8proc/Config.in
diff --git a/software/package/utf8proc/utf8proc.hash b/buildroot/package/utf8proc/utf8proc.hash
similarity index 100%
rename from software/package/utf8proc/utf8proc.hash
rename to buildroot/package/utf8proc/utf8proc.hash
diff --git a/software/package/utf8proc/utf8proc.mk b/buildroot/package/utf8proc/utf8proc.mk
similarity index 100%
rename from software/package/utf8proc/utf8proc.mk
rename to buildroot/package/utf8proc/utf8proc.mk
diff --git a/software/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch b/buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch
similarity index 100%
rename from software/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch
rename to buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch
diff --git a/software/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch b/buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch
similarity index 100%
rename from software/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch
rename to buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch
diff --git a/software/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch b/buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch
similarity index 100%
rename from software/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch
rename to buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch
diff --git a/software/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch b/buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch
similarity index 100%
rename from software/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch
rename to buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch
diff --git a/software/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch b/buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch
similarity index 100%
rename from software/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch
rename to buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch
diff --git a/software/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch b/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch
similarity index 100%
rename from software/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch
rename to buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch
diff --git a/software/package/util-linux/Config.in b/buildroot/package/util-linux/Config.in
similarity index 100%
rename from software/package/util-linux/Config.in
rename to buildroot/package/util-linux/Config.in
diff --git a/software/package/util-linux/Config.in.host b/buildroot/package/util-linux/Config.in.host
similarity index 100%
rename from software/package/util-linux/Config.in.host
rename to buildroot/package/util-linux/Config.in.host
diff --git a/software/package/util-linux/su.pam b/buildroot/package/util-linux/su.pam
similarity index 100%
rename from software/package/util-linux/su.pam
rename to buildroot/package/util-linux/su.pam
diff --git a/software/package/util-linux/util-linux.hash b/buildroot/package/util-linux/util-linux.hash
similarity index 100%
rename from software/package/util-linux/util-linux.hash
rename to buildroot/package/util-linux/util-linux.hash
diff --git a/software/package/util-linux/util-linux.mk b/buildroot/package/util-linux/util-linux.mk
similarity index 100%
rename from software/package/util-linux/util-linux.mk
rename to buildroot/package/util-linux/util-linux.mk
diff --git a/software/package/utp_com/Config.in.host b/buildroot/package/utp_com/Config.in.host
similarity index 100%
rename from software/package/utp_com/Config.in.host
rename to buildroot/package/utp_com/Config.in.host
diff --git a/software/package/utp_com/utp_com.hash b/buildroot/package/utp_com/utp_com.hash
similarity index 100%
rename from software/package/utp_com/utp_com.hash
rename to buildroot/package/utp_com/utp_com.hash
diff --git a/software/package/utp_com/utp_com.mk b/buildroot/package/utp_com/utp_com.mk
similarity index 100%
rename from software/package/utp_com/utp_com.mk
rename to buildroot/package/utp_com/utp_com.mk
diff --git a/software/package/uvw/Config.in b/buildroot/package/uvw/Config.in
similarity index 100%
rename from software/package/uvw/Config.in
rename to buildroot/package/uvw/Config.in
diff --git a/software/package/uvw/uvw.hash b/buildroot/package/uvw/uvw.hash
similarity index 100%
rename from software/package/uvw/uvw.hash
rename to buildroot/package/uvw/uvw.hash
diff --git a/software/package/uvw/uvw.mk b/buildroot/package/uvw/uvw.mk
similarity index 100%
rename from software/package/uvw/uvw.mk
rename to buildroot/package/uvw/uvw.mk
diff --git a/software/package/ux500-firmware/Config.in b/buildroot/package/ux500-firmware/Config.in
similarity index 100%
rename from software/package/ux500-firmware/Config.in
rename to buildroot/package/ux500-firmware/Config.in
diff --git a/software/package/ux500-firmware/ux500-firmware.hash b/buildroot/package/ux500-firmware/ux500-firmware.hash
similarity index 100%
rename from software/package/ux500-firmware/ux500-firmware.hash
rename to buildroot/package/ux500-firmware/ux500-firmware.hash
diff --git a/software/package/ux500-firmware/ux500-firmware.mk b/buildroot/package/ux500-firmware/ux500-firmware.mk
similarity index 100%
rename from software/package/ux500-firmware/ux500-firmware.mk
rename to buildroot/package/ux500-firmware/ux500-firmware.mk
diff --git a/software/package/v4l2grab/Config.in b/buildroot/package/v4l2grab/Config.in
similarity index 100%
rename from software/package/v4l2grab/Config.in
rename to buildroot/package/v4l2grab/Config.in
diff --git a/software/package/v4l2grab/v4l2grab.hash b/buildroot/package/v4l2grab/v4l2grab.hash
similarity index 100%
rename from software/package/v4l2grab/v4l2grab.hash
rename to buildroot/package/v4l2grab/v4l2grab.hash
diff --git a/software/package/v4l2grab/v4l2grab.mk b/buildroot/package/v4l2grab/v4l2grab.mk
similarity index 100%
rename from software/package/v4l2grab/v4l2grab.mk
rename to buildroot/package/v4l2grab/v4l2grab.mk
diff --git a/software/package/v4l2loopback/Config.in b/buildroot/package/v4l2loopback/Config.in
similarity index 100%
rename from software/package/v4l2loopback/Config.in
rename to buildroot/package/v4l2loopback/Config.in
diff --git a/software/package/v4l2loopback/v4l2loopback.hash b/buildroot/package/v4l2loopback/v4l2loopback.hash
similarity index 100%
rename from software/package/v4l2loopback/v4l2loopback.hash
rename to buildroot/package/v4l2loopback/v4l2loopback.hash
diff --git a/software/package/v4l2loopback/v4l2loopback.mk b/buildroot/package/v4l2loopback/v4l2loopback.mk
similarity index 100%
rename from software/package/v4l2loopback/v4l2loopback.mk
rename to buildroot/package/v4l2loopback/v4l2loopback.mk
diff --git a/software/package/vala/0001-dont-add-dirty-to-valac-version.patch b/buildroot/package/vala/0001-dont-add-dirty-to-valac-version.patch
similarity index 100%
rename from software/package/vala/0001-dont-add-dirty-to-valac-version.patch
rename to buildroot/package/vala/0001-dont-add-dirty-to-valac-version.patch
diff --git a/software/package/vala/vala-wrapper b/buildroot/package/vala/vala-wrapper
similarity index 100%
rename from software/package/vala/vala-wrapper
rename to buildroot/package/vala/vala-wrapper
diff --git a/software/package/vala/vala.hash b/buildroot/package/vala/vala.hash
similarity index 100%
rename from software/package/vala/vala.hash
rename to buildroot/package/vala/vala.hash
diff --git a/software/package/vala/vala.mk b/buildroot/package/vala/vala.mk
similarity index 100%
rename from software/package/vala/vala.mk
rename to buildroot/package/vala/vala.mk
diff --git a/software/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch b/buildroot/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch
similarity index 100%
rename from software/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch
rename to buildroot/package/valgrind/0001-workaround-SIGSEGV-on-PPC.patch
diff --git a/software/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch b/buildroot/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch
similarity index 100%
rename from software/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch
rename to buildroot/package/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch
diff --git a/software/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch b/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch
similarity index 100%
rename from software/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch
rename to buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch
diff --git a/software/package/valgrind/Config.in b/buildroot/package/valgrind/Config.in
similarity index 100%
rename from software/package/valgrind/Config.in
rename to buildroot/package/valgrind/Config.in
diff --git a/software/package/valgrind/uclibc.supp b/buildroot/package/valgrind/uclibc.supp
similarity index 100%
rename from software/package/valgrind/uclibc.supp
rename to buildroot/package/valgrind/uclibc.supp
diff --git a/software/package/valgrind/valgrind.hash b/buildroot/package/valgrind/valgrind.hash
similarity index 100%
rename from software/package/valgrind/valgrind.hash
rename to buildroot/package/valgrind/valgrind.hash
diff --git a/software/package/valgrind/valgrind.mk b/buildroot/package/valgrind/valgrind.mk
similarity index 100%
rename from software/package/valgrind/valgrind.mk
rename to buildroot/package/valgrind/valgrind.mk
diff --git a/software/package/valijson/Config.in b/buildroot/package/valijson/Config.in
similarity index 100%
rename from software/package/valijson/Config.in
rename to buildroot/package/valijson/Config.in
diff --git a/software/package/valijson/valijson.hash b/buildroot/package/valijson/valijson.hash
similarity index 100%
rename from software/package/valijson/valijson.hash
rename to buildroot/package/valijson/valijson.hash
diff --git a/software/package/valijson/valijson.mk b/buildroot/package/valijson/valijson.mk
similarity index 100%
rename from software/package/valijson/valijson.mk
rename to buildroot/package/valijson/valijson.mk
diff --git a/software/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch b/buildroot/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch
similarity index 100%
rename from software/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch
rename to buildroot/package/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch
diff --git a/software/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch b/buildroot/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch
similarity index 100%
rename from software/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch
rename to buildroot/package/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch
diff --git a/software/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch b/buildroot/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch
similarity index 100%
rename from software/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch
rename to buildroot/package/vboot-utils/0003-Avoid-RSA-type-redefinition.patch
diff --git a/software/package/vboot-utils/0004-Disable-static-futility.patch b/buildroot/package/vboot-utils/0004-Disable-static-futility.patch
similarity index 100%
rename from software/package/vboot-utils/0004-Disable-static-futility.patch
rename to buildroot/package/vboot-utils/0004-Disable-static-futility.patch
diff --git a/software/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/buildroot/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
similarity index 100%
rename from software/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
rename to buildroot/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
diff --git a/software/package/vboot-utils/0006-Update-for-openssl-1.1.patch b/buildroot/package/vboot-utils/0006-Update-for-openssl-1.1.patch
similarity index 100%
rename from software/package/vboot-utils/0006-Update-for-openssl-1.1.patch
rename to buildroot/package/vboot-utils/0006-Update-for-openssl-1.1.patch
diff --git a/software/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch b/buildroot/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch
similarity index 100%
rename from software/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch
rename to buildroot/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch
diff --git a/software/package/vboot-utils/Config.in.host b/buildroot/package/vboot-utils/Config.in.host
similarity index 100%
rename from software/package/vboot-utils/Config.in.host
rename to buildroot/package/vboot-utils/Config.in.host
diff --git a/software/package/vboot-utils/vboot-utils.hash b/buildroot/package/vboot-utils/vboot-utils.hash
similarity index 100%
rename from software/package/vboot-utils/vboot-utils.hash
rename to buildroot/package/vboot-utils/vboot-utils.hash
diff --git a/software/package/vboot-utils/vboot-utils.mk b/buildroot/package/vboot-utils/vboot-utils.mk
similarity index 100%
rename from software/package/vboot-utils/vboot-utils.mk
rename to buildroot/package/vboot-utils/vboot-utils.mk
diff --git a/software/package/vde2/0001-no-cxx.patch b/buildroot/package/vde2/0001-no-cxx.patch
similarity index 100%
rename from software/package/vde2/0001-no-cxx.patch
rename to buildroot/package/vde2/0001-no-cxx.patch
diff --git a/software/package/vde2/0002-fstp-Add-static-to-inline-functions.patch b/buildroot/package/vde2/0002-fstp-Add-static-to-inline-functions.patch
similarity index 100%
rename from software/package/vde2/0002-fstp-Add-static-to-inline-functions.patch
rename to buildroot/package/vde2/0002-fstp-Add-static-to-inline-functions.patch
diff --git a/software/package/vde2/Config.in b/buildroot/package/vde2/Config.in
similarity index 100%
rename from software/package/vde2/Config.in
rename to buildroot/package/vde2/Config.in
diff --git a/software/package/vde2/vde2.hash b/buildroot/package/vde2/vde2.hash
similarity index 100%
rename from software/package/vde2/vde2.hash
rename to buildroot/package/vde2/vde2.hash
diff --git a/software/package/vde2/vde2.mk b/buildroot/package/vde2/vde2.mk
similarity index 100%
rename from software/package/vde2/vde2.mk
rename to buildroot/package/vde2/vde2.mk
diff --git a/software/package/vdr-plugin-vnsiserver/Config.in b/buildroot/package/vdr-plugin-vnsiserver/Config.in
similarity index 100%
rename from software/package/vdr-plugin-vnsiserver/Config.in
rename to buildroot/package/vdr-plugin-vnsiserver/Config.in
diff --git a/software/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash
similarity index 100%
rename from software/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash
rename to buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash
diff --git a/software/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
similarity index 100%
rename from software/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
rename to buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
diff --git a/software/package/vdr/0001-libjpeg.patch b/buildroot/package/vdr/0001-libjpeg.patch
similarity index 100%
rename from software/package/vdr/0001-libjpeg.patch
rename to buildroot/package/vdr/0001-libjpeg.patch
diff --git a/software/package/vdr/Config.in b/buildroot/package/vdr/Config.in
similarity index 100%
rename from software/package/vdr/Config.in
rename to buildroot/package/vdr/Config.in
diff --git a/software/package/vdr/vdr.hash b/buildroot/package/vdr/vdr.hash
similarity index 100%
rename from software/package/vdr/vdr.hash
rename to buildroot/package/vdr/vdr.hash
diff --git a/software/package/vdr/vdr.mk b/buildroot/package/vdr/vdr.mk
similarity index 100%
rename from software/package/vdr/vdr.mk
rename to buildroot/package/vdr/vdr.mk
diff --git a/software/package/vim/Config.in b/buildroot/package/vim/Config.in
similarity index 100%
rename from software/package/vim/Config.in
rename to buildroot/package/vim/Config.in
diff --git a/software/package/vim/vim.hash b/buildroot/package/vim/vim.hash
similarity index 100%
rename from software/package/vim/vim.hash
rename to buildroot/package/vim/vim.hash
diff --git a/software/package/vim/vim.mk b/buildroot/package/vim/vim.mk
similarity index 100%
rename from software/package/vim/vim.mk
rename to buildroot/package/vim/vim.mk
diff --git a/software/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch b/buildroot/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
similarity index 100%
rename from software/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
rename to buildroot/package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch
diff --git a/software/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch b/buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
similarity index 100%
rename from software/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
rename to buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch
diff --git a/software/package/vlc/0003-automake-add-subdir-objects-option.patch b/buildroot/package/vlc/0003-automake-add-subdir-objects-option.patch
similarity index 100%
rename from software/package/vlc/0003-automake-add-subdir-objects-option.patch
rename to buildroot/package/vlc/0003-automake-add-subdir-objects-option.patch
diff --git a/software/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch b/buildroot/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch
similarity index 100%
rename from software/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch
rename to buildroot/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch
diff --git a/software/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch b/buildroot/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
similarity index 100%
rename from software/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
rename to buildroot/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch
diff --git a/software/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch b/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
similarity index 100%
rename from software/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
rename to buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch
diff --git a/software/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch b/buildroot/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch
similarity index 100%
rename from software/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch
rename to buildroot/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch
diff --git a/software/package/vlc/0008-Add-support-for-freerdp2.patch b/buildroot/package/vlc/0008-Add-support-for-freerdp2.patch
similarity index 100%
rename from software/package/vlc/0008-Add-support-for-freerdp2.patch
rename to buildroot/package/vlc/0008-Add-support-for-freerdp2.patch
diff --git a/software/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch b/buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
similarity index 100%
rename from software/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
rename to buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
diff --git a/software/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch b/buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch
similarity index 100%
rename from software/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch
rename to buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch
diff --git a/software/package/vlc/Config.in b/buildroot/package/vlc/Config.in
similarity index 100%
rename from software/package/vlc/Config.in
rename to buildroot/package/vlc/Config.in
diff --git a/software/package/vlc/vlc.hash b/buildroot/package/vlc/vlc.hash
similarity index 100%
rename from software/package/vlc/vlc.hash
rename to buildroot/package/vlc/vlc.hash
diff --git a/software/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk
similarity index 100%
rename from software/package/vlc/vlc.mk
rename to buildroot/package/vlc/vlc.mk
diff --git a/software/package/vmtouch/Config.in b/buildroot/package/vmtouch/Config.in
similarity index 100%
rename from software/package/vmtouch/Config.in
rename to buildroot/package/vmtouch/Config.in
diff --git a/software/package/vmtouch/vmtouch.hash b/buildroot/package/vmtouch/vmtouch.hash
similarity index 100%
rename from software/package/vmtouch/vmtouch.hash
rename to buildroot/package/vmtouch/vmtouch.hash
diff --git a/software/package/vmtouch/vmtouch.mk b/buildroot/package/vmtouch/vmtouch.mk
similarity index 100%
rename from software/package/vmtouch/vmtouch.mk
rename to buildroot/package/vmtouch/vmtouch.mk
diff --git a/software/package/vnstat/Config.in b/buildroot/package/vnstat/Config.in
similarity index 100%
rename from software/package/vnstat/Config.in
rename to buildroot/package/vnstat/Config.in
diff --git a/software/package/vnstat/vnstat.hash b/buildroot/package/vnstat/vnstat.hash
similarity index 100%
rename from software/package/vnstat/vnstat.hash
rename to buildroot/package/vnstat/vnstat.hash
diff --git a/software/package/vnstat/vnstat.mk b/buildroot/package/vnstat/vnstat.mk
similarity index 100%
rename from software/package/vnstat/vnstat.mk
rename to buildroot/package/vnstat/vnstat.mk
diff --git a/software/package/vo-aacenc/Config.in b/buildroot/package/vo-aacenc/Config.in
similarity index 100%
rename from software/package/vo-aacenc/Config.in
rename to buildroot/package/vo-aacenc/Config.in
diff --git a/software/package/vo-aacenc/vo-aacenc.hash b/buildroot/package/vo-aacenc/vo-aacenc.hash
similarity index 100%
rename from software/package/vo-aacenc/vo-aacenc.hash
rename to buildroot/package/vo-aacenc/vo-aacenc.hash
diff --git a/software/package/vo-aacenc/vo-aacenc.mk b/buildroot/package/vo-aacenc/vo-aacenc.mk
similarity index 100%
rename from software/package/vo-aacenc/vo-aacenc.mk
rename to buildroot/package/vo-aacenc/vo-aacenc.mk
diff --git a/software/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch b/buildroot/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
similarity index 100%
rename from software/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
rename to buildroot/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
diff --git a/software/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch b/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch
similarity index 100%
rename from software/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch
rename to buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch
diff --git a/software/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch b/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch
similarity index 100%
rename from software/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch
rename to buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch
diff --git a/software/package/vorbis-tools/Config.in b/buildroot/package/vorbis-tools/Config.in
similarity index 100%
rename from software/package/vorbis-tools/Config.in
rename to buildroot/package/vorbis-tools/Config.in
diff --git a/software/package/vorbis-tools/vorbis-tools.hash b/buildroot/package/vorbis-tools/vorbis-tools.hash
similarity index 100%
rename from software/package/vorbis-tools/vorbis-tools.hash
rename to buildroot/package/vorbis-tools/vorbis-tools.hash
diff --git a/software/package/vorbis-tools/vorbis-tools.mk b/buildroot/package/vorbis-tools/vorbis-tools.mk
similarity index 100%
rename from software/package/vorbis-tools/vorbis-tools.mk
rename to buildroot/package/vorbis-tools/vorbis-tools.mk
diff --git a/software/package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch b/buildroot/package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch
similarity index 100%
rename from software/package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch
rename to buildroot/package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch
diff --git a/software/package/vpnc/0002-Makefile-allow-to-override-the-version.patch b/buildroot/package/vpnc/0002-Makefile-allow-to-override-the-version.patch
similarity index 100%
rename from software/package/vpnc/0002-Makefile-allow-to-override-the-version.patch
rename to buildroot/package/vpnc/0002-Makefile-allow-to-override-the-version.patch
diff --git a/software/package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch b/buildroot/package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch
similarity index 100%
rename from software/package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch
rename to buildroot/package/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch
diff --git a/software/package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch b/buildroot/package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch
similarity index 100%
rename from software/package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch
rename to buildroot/package/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch
diff --git a/software/package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch b/buildroot/package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch
similarity index 100%
rename from software/package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch
rename to buildroot/package/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch
diff --git a/software/package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch b/buildroot/package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch
similarity index 100%
rename from software/package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch
rename to buildroot/package/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch
diff --git a/software/package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch b/buildroot/package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch
similarity index 100%
rename from software/package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch
rename to buildroot/package/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch
diff --git a/software/package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch b/buildroot/package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch
similarity index 100%
rename from software/package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch
rename to buildroot/package/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch
diff --git a/software/package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch b/buildroot/package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch
similarity index 100%
rename from software/package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch
rename to buildroot/package/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch
diff --git a/software/package/vpnc/Config.in b/buildroot/package/vpnc/Config.in
similarity index 100%
rename from software/package/vpnc/Config.in
rename to buildroot/package/vpnc/Config.in
diff --git a/software/package/vpnc/vpnc.hash b/buildroot/package/vpnc/vpnc.hash
similarity index 100%
rename from software/package/vpnc/vpnc.hash
rename to buildroot/package/vpnc/vpnc.hash
diff --git a/software/package/vpnc/vpnc.mk b/buildroot/package/vpnc/vpnc.mk
similarity index 100%
rename from software/package/vpnc/vpnc.mk
rename to buildroot/package/vpnc/vpnc.mk
diff --git a/software/package/vsftpd/0001-utmpx-builddef.patch b/buildroot/package/vsftpd/0001-utmpx-builddef.patch
similarity index 100%
rename from software/package/vsftpd/0001-utmpx-builddef.patch
rename to buildroot/package/vsftpd/0001-utmpx-builddef.patch
diff --git a/software/package/vsftpd/0002-fix-CVE-2015-1419.patch b/buildroot/package/vsftpd/0002-fix-CVE-2015-1419.patch
similarity index 100%
rename from software/package/vsftpd/0002-fix-CVE-2015-1419.patch
rename to buildroot/package/vsftpd/0002-fix-CVE-2015-1419.patch
diff --git a/software/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch b/buildroot/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
similarity index 100%
rename from software/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
rename to buildroot/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
diff --git a/software/package/vsftpd/Config.in b/buildroot/package/vsftpd/Config.in
similarity index 100%
rename from software/package/vsftpd/Config.in
rename to buildroot/package/vsftpd/Config.in
diff --git a/software/package/vsftpd/S70vsftpd b/buildroot/package/vsftpd/S70vsftpd
similarity index 100%
rename from software/package/vsftpd/S70vsftpd
rename to buildroot/package/vsftpd/S70vsftpd
diff --git a/software/package/vsftpd/vsftpd.hash b/buildroot/package/vsftpd/vsftpd.hash
similarity index 100%
rename from software/package/vsftpd/vsftpd.hash
rename to buildroot/package/vsftpd/vsftpd.hash
diff --git a/software/package/vsftpd/vsftpd.mk b/buildroot/package/vsftpd/vsftpd.mk
similarity index 100%
rename from software/package/vsftpd/vsftpd.mk
rename to buildroot/package/vsftpd/vsftpd.mk
diff --git a/software/package/vte/Config.in b/buildroot/package/vte/Config.in
similarity index 100%
rename from software/package/vte/Config.in
rename to buildroot/package/vte/Config.in
diff --git a/software/package/vte/vte.hash b/buildroot/package/vte/vte.hash
similarity index 100%
rename from software/package/vte/vte.hash
rename to buildroot/package/vte/vte.hash
diff --git a/software/package/vte/vte.mk b/buildroot/package/vte/vte.mk
similarity index 100%
rename from software/package/vte/vte.mk
rename to buildroot/package/vte/vte.mk
diff --git a/software/package/vtun/0001-fix-installation.patch b/buildroot/package/vtun/0001-fix-installation.patch
similarity index 100%
rename from software/package/vtun/0001-fix-installation.patch
rename to buildroot/package/vtun/0001-fix-installation.patch
diff --git a/software/package/vtun/0002-fix-ssl-headers-checks.patch b/buildroot/package/vtun/0002-fix-ssl-headers-checks.patch
similarity index 100%
rename from software/package/vtun/0002-fix-ssl-headers-checks.patch
rename to buildroot/package/vtun/0002-fix-ssl-headers-checks.patch
diff --git a/software/package/vtun/0003-openssl11.patch b/buildroot/package/vtun/0003-openssl11.patch
similarity index 100%
rename from software/package/vtun/0003-openssl11.patch
rename to buildroot/package/vtun/0003-openssl11.patch
diff --git a/software/package/vtun/Config.in b/buildroot/package/vtun/Config.in
similarity index 100%
rename from software/package/vtun/Config.in
rename to buildroot/package/vtun/Config.in
diff --git a/software/package/vtun/vtun.hash b/buildroot/package/vtun/vtun.hash
similarity index 100%
rename from software/package/vtun/vtun.hash
rename to buildroot/package/vtun/vtun.hash
diff --git a/software/package/vtun/vtun.mk b/buildroot/package/vtun/vtun.mk
similarity index 100%
rename from software/package/vtun/vtun.mk
rename to buildroot/package/vtun/vtun.mk
diff --git a/software/package/w_scan/0001-musl.patch b/buildroot/package/w_scan/0001-musl.patch
similarity index 100%
rename from software/package/w_scan/0001-musl.patch
rename to buildroot/package/w_scan/0001-musl.patch
diff --git a/software/package/w_scan/Config.in b/buildroot/package/w_scan/Config.in
similarity index 100%
rename from software/package/w_scan/Config.in
rename to buildroot/package/w_scan/Config.in
diff --git a/software/package/w_scan/w_scan.hash b/buildroot/package/w_scan/w_scan.hash
similarity index 100%
rename from software/package/w_scan/w_scan.hash
rename to buildroot/package/w_scan/w_scan.hash
diff --git a/software/package/w_scan/w_scan.mk b/buildroot/package/w_scan/w_scan.mk
similarity index 100%
rename from software/package/w_scan/w_scan.mk
rename to buildroot/package/w_scan/w_scan.mk
diff --git a/software/package/waf/waf.hash b/buildroot/package/waf/waf.hash
similarity index 100%
rename from software/package/waf/waf.hash
rename to buildroot/package/waf/waf.hash
diff --git a/software/package/waf/waf.mk b/buildroot/package/waf/waf.mk
similarity index 100%
rename from software/package/waf/waf.mk
rename to buildroot/package/waf/waf.mk
diff --git a/software/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/buildroot/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
similarity index 100%
rename from software/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
rename to buildroot/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
diff --git a/software/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/buildroot/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
similarity index 100%
rename from software/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
rename to buildroot/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
diff --git a/software/package/waffle/Config.in b/buildroot/package/waffle/Config.in
similarity index 100%
rename from software/package/waffle/Config.in
rename to buildroot/package/waffle/Config.in
diff --git a/software/package/waffle/waffle.hash b/buildroot/package/waffle/waffle.hash
similarity index 100%
rename from software/package/waffle/waffle.hash
rename to buildroot/package/waffle/waffle.hash
diff --git a/software/package/waffle/waffle.mk b/buildroot/package/waffle/waffle.mk
similarity index 100%
rename from software/package/waffle/waffle.mk
rename to buildroot/package/waffle/waffle.mk
diff --git a/software/package/wampcc/0001-Add-RISC-V-endian-detection.patch b/buildroot/package/wampcc/0001-Add-RISC-V-endian-detection.patch
similarity index 100%
rename from software/package/wampcc/0001-Add-RISC-V-endian-detection.patch
rename to buildroot/package/wampcc/0001-Add-RISC-V-endian-detection.patch
diff --git a/software/package/wampcc/Config.in b/buildroot/package/wampcc/Config.in
similarity index 100%
rename from software/package/wampcc/Config.in
rename to buildroot/package/wampcc/Config.in
diff --git a/software/package/wampcc/wampcc.hash b/buildroot/package/wampcc/wampcc.hash
similarity index 100%
rename from software/package/wampcc/wampcc.hash
rename to buildroot/package/wampcc/wampcc.hash
diff --git a/software/package/wampcc/wampcc.mk b/buildroot/package/wampcc/wampcc.mk
similarity index 100%
rename from software/package/wampcc/wampcc.mk
rename to buildroot/package/wampcc/wampcc.mk
diff --git a/software/package/wavemon/Config.in b/buildroot/package/wavemon/Config.in
similarity index 100%
rename from software/package/wavemon/Config.in
rename to buildroot/package/wavemon/Config.in
diff --git a/software/package/wavemon/wavemon.hash b/buildroot/package/wavemon/wavemon.hash
similarity index 100%
rename from software/package/wavemon/wavemon.hash
rename to buildroot/package/wavemon/wavemon.hash
diff --git a/software/package/wavemon/wavemon.mk b/buildroot/package/wavemon/wavemon.mk
similarity index 100%
rename from software/package/wavemon/wavemon.mk
rename to buildroot/package/wavemon/wavemon.mk
diff --git a/software/package/wavpack/Config.in b/buildroot/package/wavpack/Config.in
similarity index 100%
rename from software/package/wavpack/Config.in
rename to buildroot/package/wavpack/Config.in
diff --git a/software/package/wavpack/wavpack.hash b/buildroot/package/wavpack/wavpack.hash
similarity index 100%
rename from software/package/wavpack/wavpack.hash
rename to buildroot/package/wavpack/wavpack.hash
diff --git a/software/package/wavpack/wavpack.mk b/buildroot/package/wavpack/wavpack.mk
similarity index 100%
rename from software/package/wavpack/wavpack.mk
rename to buildroot/package/wavpack/wavpack.mk
diff --git a/software/package/wayland-protocols/Config.in b/buildroot/package/wayland-protocols/Config.in
similarity index 100%
rename from software/package/wayland-protocols/Config.in
rename to buildroot/package/wayland-protocols/Config.in
diff --git a/software/package/wayland-protocols/wayland-protocols.hash b/buildroot/package/wayland-protocols/wayland-protocols.hash
similarity index 100%
rename from software/package/wayland-protocols/wayland-protocols.hash
rename to buildroot/package/wayland-protocols/wayland-protocols.hash
diff --git a/software/package/wayland-protocols/wayland-protocols.mk b/buildroot/package/wayland-protocols/wayland-protocols.mk
similarity index 100%
rename from software/package/wayland-protocols/wayland-protocols.mk
rename to buildroot/package/wayland-protocols/wayland-protocols.mk
diff --git a/software/package/wayland/0001-configure-add-option-to-disable-tests.patch b/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch
similarity index 100%
rename from software/package/wayland/0001-configure-add-option-to-disable-tests.patch
rename to buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch
diff --git a/software/package/wayland/Config.in b/buildroot/package/wayland/Config.in
similarity index 100%
rename from software/package/wayland/Config.in
rename to buildroot/package/wayland/Config.in
diff --git a/software/package/wayland/wayland.hash b/buildroot/package/wayland/wayland.hash
similarity index 100%
rename from software/package/wayland/wayland.hash
rename to buildroot/package/wayland/wayland.hash
diff --git a/software/package/wayland/wayland.mk b/buildroot/package/wayland/wayland.mk
similarity index 100%
rename from software/package/wayland/wayland.mk
rename to buildroot/package/wayland/wayland.mk
diff --git a/software/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch b/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch
similarity index 100%
rename from software/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch
rename to buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch
diff --git a/software/package/waylandpp/Config.in b/buildroot/package/waylandpp/Config.in
similarity index 100%
rename from software/package/waylandpp/Config.in
rename to buildroot/package/waylandpp/Config.in
diff --git a/software/package/waylandpp/waylandpp.hash b/buildroot/package/waylandpp/waylandpp.hash
similarity index 100%
rename from software/package/waylandpp/waylandpp.hash
rename to buildroot/package/waylandpp/waylandpp.hash
diff --git a/software/package/waylandpp/waylandpp.mk b/buildroot/package/waylandpp/waylandpp.mk
similarity index 100%
rename from software/package/waylandpp/waylandpp.mk
rename to buildroot/package/waylandpp/waylandpp.mk
diff --git a/software/package/webkitgtk/Config.in b/buildroot/package/webkitgtk/Config.in
similarity index 100%
rename from software/package/webkitgtk/Config.in
rename to buildroot/package/webkitgtk/Config.in
diff --git a/software/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash
similarity index 100%
rename from software/package/webkitgtk/webkitgtk.hash
rename to buildroot/package/webkitgtk/webkitgtk.hash
diff --git a/software/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk
similarity index 100%
rename from software/package/webkitgtk/webkitgtk.mk
rename to buildroot/package/webkitgtk/webkitgtk.mk
diff --git a/software/package/webp/Config.in b/buildroot/package/webp/Config.in
similarity index 100%
rename from software/package/webp/Config.in
rename to buildroot/package/webp/Config.in
diff --git a/software/package/webp/webp.hash b/buildroot/package/webp/webp.hash
similarity index 100%
rename from software/package/webp/webp.hash
rename to buildroot/package/webp/webp.hash
diff --git a/software/package/webp/webp.mk b/buildroot/package/webp/webp.mk
similarity index 100%
rename from software/package/webp/webp.mk
rename to buildroot/package/webp/webp.mk
diff --git a/software/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch b/buildroot/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch
similarity index 100%
rename from software/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch
rename to buildroot/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch
diff --git a/software/package/webrtc-audio-processing/Config.in b/buildroot/package/webrtc-audio-processing/Config.in
similarity index 100%
rename from software/package/webrtc-audio-processing/Config.in
rename to buildroot/package/webrtc-audio-processing/Config.in
diff --git a/software/package/webrtc-audio-processing/webrtc-audio-processing.hash b/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.hash
similarity index 100%
rename from software/package/webrtc-audio-processing/webrtc-audio-processing.hash
rename to buildroot/package/webrtc-audio-processing/webrtc-audio-processing.hash
diff --git a/software/package/webrtc-audio-processing/webrtc-audio-processing.mk b/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk
similarity index 100%
rename from software/package/webrtc-audio-processing/webrtc-audio-processing.mk
rename to buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk
diff --git a/software/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch b/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch
similarity index 100%
rename from software/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch
rename to buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch
diff --git a/software/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch b/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch
similarity index 100%
rename from software/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch
rename to buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch
diff --git a/software/package/websocketpp/Config.in b/buildroot/package/websocketpp/Config.in
similarity index 100%
rename from software/package/websocketpp/Config.in
rename to buildroot/package/websocketpp/Config.in
diff --git a/software/package/websocketpp/websocketpp.hash b/buildroot/package/websocketpp/websocketpp.hash
similarity index 100%
rename from software/package/websocketpp/websocketpp.hash
rename to buildroot/package/websocketpp/websocketpp.hash
diff --git a/software/package/websocketpp/websocketpp.mk b/buildroot/package/websocketpp/websocketpp.mk
similarity index 100%
rename from software/package/websocketpp/websocketpp.mk
rename to buildroot/package/websocketpp/websocketpp.mk
diff --git a/software/package/weston-imx/Config.in b/buildroot/package/weston-imx/Config.in
similarity index 100%
rename from software/package/weston-imx/Config.in
rename to buildroot/package/weston-imx/Config.in
diff --git a/software/package/weston-imx/weston-imx.hash b/buildroot/package/weston-imx/weston-imx.hash
similarity index 100%
rename from software/package/weston-imx/weston-imx.hash
rename to buildroot/package/weston-imx/weston-imx.hash
diff --git a/software/package/weston-imx/weston-imx.mk b/buildroot/package/weston-imx/weston-imx.mk
similarity index 100%
rename from software/package/weston-imx/weston-imx.mk
rename to buildroot/package/weston-imx/weston-imx.mk
diff --git a/software/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch b/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
similarity index 100%
rename from software/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
rename to buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
diff --git a/software/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch b/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
similarity index 100%
rename from software/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
rename to buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
diff --git a/software/package/weston/Config.in b/buildroot/package/weston/Config.in
similarity index 100%
rename from software/package/weston/Config.in
rename to buildroot/package/weston/Config.in
diff --git a/software/package/weston/weston.hash b/buildroot/package/weston/weston.hash
similarity index 100%
rename from software/package/weston/weston.hash
rename to buildroot/package/weston/weston.hash
diff --git a/software/package/weston/weston.mk b/buildroot/package/weston/weston.mk
similarity index 100%
rename from software/package/weston/weston.mk
rename to buildroot/package/weston/weston.mk
diff --git a/software/package/wf111/Config.in b/buildroot/package/wf111/Config.in
similarity index 100%
rename from software/package/wf111/Config.in
rename to buildroot/package/wf111/Config.in
diff --git a/software/package/wf111/wf111.hash b/buildroot/package/wf111/wf111.hash
similarity index 100%
rename from software/package/wf111/wf111.hash
rename to buildroot/package/wf111/wf111.hash
diff --git a/software/package/wf111/wf111.mk b/buildroot/package/wf111/wf111.mk
similarity index 100%
rename from software/package/wf111/wf111.mk
rename to buildroot/package/wf111/wf111.mk
diff --git a/software/package/wget/Config.in b/buildroot/package/wget/Config.in
similarity index 100%
rename from software/package/wget/Config.in
rename to buildroot/package/wget/Config.in
diff --git a/software/package/wget/wget.hash b/buildroot/package/wget/wget.hash
similarity index 100%
rename from software/package/wget/wget.hash
rename to buildroot/package/wget/wget.hash
diff --git a/software/package/wget/wget.mk b/buildroot/package/wget/wget.mk
similarity index 100%
rename from software/package/wget/wget.mk
rename to buildroot/package/wget/wget.mk
diff --git a/software/package/whetstone/Config.in b/buildroot/package/whetstone/Config.in
similarity index 100%
rename from software/package/whetstone/Config.in
rename to buildroot/package/whetstone/Config.in
diff --git a/software/package/whetstone/whetstone.hash b/buildroot/package/whetstone/whetstone.hash
similarity index 100%
rename from software/package/whetstone/whetstone.hash
rename to buildroot/package/whetstone/whetstone.hash
diff --git a/software/package/whetstone/whetstone.mk b/buildroot/package/whetstone/whetstone.mk
similarity index 100%
rename from software/package/whetstone/whetstone.mk
rename to buildroot/package/whetstone/whetstone.mk
diff --git a/software/package/which/Config.in b/buildroot/package/which/Config.in
similarity index 100%
rename from software/package/which/Config.in
rename to buildroot/package/which/Config.in
diff --git a/software/package/which/which.hash b/buildroot/package/which/which.hash
similarity index 100%
rename from software/package/which/which.hash
rename to buildroot/package/which/which.hash
diff --git a/software/package/which/which.mk b/buildroot/package/which/which.mk
similarity index 100%
rename from software/package/which/which.mk
rename to buildroot/package/which/which.mk
diff --git a/software/package/whois/Config.in b/buildroot/package/whois/Config.in
similarity index 100%
rename from software/package/whois/Config.in
rename to buildroot/package/whois/Config.in
diff --git a/software/package/whois/whois.hash b/buildroot/package/whois/whois.hash
similarity index 100%
rename from software/package/whois/whois.hash
rename to buildroot/package/whois/whois.hash
diff --git a/software/package/whois/whois.mk b/buildroot/package/whois/whois.mk
similarity index 100%
rename from software/package/whois/whois.mk
rename to buildroot/package/whois/whois.mk
diff --git a/software/package/wilc1000-firmware/Config.in b/buildroot/package/wilc1000-firmware/Config.in
similarity index 100%
rename from software/package/wilc1000-firmware/Config.in
rename to buildroot/package/wilc1000-firmware/Config.in
diff --git a/software/package/wilc1000-firmware/wilc1000-firmware.hash b/buildroot/package/wilc1000-firmware/wilc1000-firmware.hash
similarity index 100%
rename from software/package/wilc1000-firmware/wilc1000-firmware.hash
rename to buildroot/package/wilc1000-firmware/wilc1000-firmware.hash
diff --git a/software/package/wilc1000-firmware/wilc1000-firmware.mk b/buildroot/package/wilc1000-firmware/wilc1000-firmware.mk
similarity index 100%
rename from software/package/wilc1000-firmware/wilc1000-firmware.mk
rename to buildroot/package/wilc1000-firmware/wilc1000-firmware.mk
diff --git a/software/package/wilink-bt-firmware/Config.in b/buildroot/package/wilink-bt-firmware/Config.in
similarity index 100%
rename from software/package/wilink-bt-firmware/Config.in
rename to buildroot/package/wilink-bt-firmware/Config.in
diff --git a/software/package/wilink-bt-firmware/wilink-bt-firmware.hash b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash
similarity index 100%
rename from software/package/wilink-bt-firmware/wilink-bt-firmware.hash
rename to buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash
diff --git a/software/package/wilink-bt-firmware/wilink-bt-firmware.mk b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk
similarity index 100%
rename from software/package/wilink-bt-firmware/wilink-bt-firmware.mk
rename to buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk
diff --git a/software/package/wine/Config.in b/buildroot/package/wine/Config.in
similarity index 100%
rename from software/package/wine/Config.in
rename to buildroot/package/wine/Config.in
diff --git a/software/package/wine/wine.hash b/buildroot/package/wine/wine.hash
similarity index 100%
rename from software/package/wine/wine.hash
rename to buildroot/package/wine/wine.hash
diff --git a/software/package/wine/wine.mk b/buildroot/package/wine/wine.mk
similarity index 100%
rename from software/package/wine/wine.mk
rename to buildroot/package/wine/wine.mk
diff --git a/software/package/wipe/0001-musl.patch b/buildroot/package/wipe/0001-musl.patch
similarity index 100%
rename from software/package/wipe/0001-musl.patch
rename to buildroot/package/wipe/0001-musl.patch
diff --git a/software/package/wipe/Config.in b/buildroot/package/wipe/Config.in
similarity index 100%
rename from software/package/wipe/Config.in
rename to buildroot/package/wipe/Config.in
diff --git a/software/package/wipe/wipe.hash b/buildroot/package/wipe/wipe.hash
similarity index 100%
rename from software/package/wipe/wipe.hash
rename to buildroot/package/wipe/wipe.hash
diff --git a/software/package/wipe/wipe.mk b/buildroot/package/wipe/wipe.mk
similarity index 100%
rename from software/package/wipe/wipe.mk
rename to buildroot/package/wipe/wipe.mk
diff --git a/software/package/wireguard-linux-compat/Config.in b/buildroot/package/wireguard-linux-compat/Config.in
similarity index 100%
rename from software/package/wireguard-linux-compat/Config.in
rename to buildroot/package/wireguard-linux-compat/Config.in
diff --git a/software/package/wireguard-linux-compat/wireguard-linux-compat.hash b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash
similarity index 100%
rename from software/package/wireguard-linux-compat/wireguard-linux-compat.hash
rename to buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash
diff --git a/software/package/wireguard-linux-compat/wireguard-linux-compat.mk b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk
similarity index 100%
rename from software/package/wireguard-linux-compat/wireguard-linux-compat.mk
rename to buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk
diff --git a/software/package/wireguard-tools/Config.in b/buildroot/package/wireguard-tools/Config.in
similarity index 100%
rename from software/package/wireguard-tools/Config.in
rename to buildroot/package/wireguard-tools/Config.in
diff --git a/software/package/wireguard-tools/wireguard-tools.hash b/buildroot/package/wireguard-tools/wireguard-tools.hash
similarity index 100%
rename from software/package/wireguard-tools/wireguard-tools.hash
rename to buildroot/package/wireguard-tools/wireguard-tools.hash
diff --git a/software/package/wireguard-tools/wireguard-tools.mk b/buildroot/package/wireguard-tools/wireguard-tools.mk
similarity index 100%
rename from software/package/wireguard-tools/wireguard-tools.mk
rename to buildroot/package/wireguard-tools/wireguard-tools.mk
diff --git a/software/package/wireless-regdb/Config.in b/buildroot/package/wireless-regdb/Config.in
similarity index 100%
rename from software/package/wireless-regdb/Config.in
rename to buildroot/package/wireless-regdb/Config.in
diff --git a/software/package/wireless-regdb/wireless-regdb.hash b/buildroot/package/wireless-regdb/wireless-regdb.hash
similarity index 100%
rename from software/package/wireless-regdb/wireless-regdb.hash
rename to buildroot/package/wireless-regdb/wireless-regdb.hash
diff --git a/software/package/wireless-regdb/wireless-regdb.mk b/buildroot/package/wireless-regdb/wireless-regdb.mk
similarity index 100%
rename from software/package/wireless-regdb/wireless-regdb.mk
rename to buildroot/package/wireless-regdb/wireless-regdb.mk
diff --git a/software/package/wireless_tools/0001-remove-bzero.patch b/buildroot/package/wireless_tools/0001-remove-bzero.patch
similarity index 100%
rename from software/package/wireless_tools/0001-remove-bzero.patch
rename to buildroot/package/wireless_tools/0001-remove-bzero.patch
diff --git a/software/package/wireless_tools/Config.in b/buildroot/package/wireless_tools/Config.in
similarity index 100%
rename from software/package/wireless_tools/Config.in
rename to buildroot/package/wireless_tools/Config.in
diff --git a/software/package/wireless_tools/wireless_tools.hash b/buildroot/package/wireless_tools/wireless_tools.hash
similarity index 100%
rename from software/package/wireless_tools/wireless_tools.hash
rename to buildroot/package/wireless_tools/wireless_tools.hash
diff --git a/software/package/wireless_tools/wireless_tools.mk b/buildroot/package/wireless_tools/wireless_tools.mk
similarity index 100%
rename from software/package/wireless_tools/wireless_tools.mk
rename to buildroot/package/wireless_tools/wireless_tools.mk
diff --git a/software/package/wireshark/Config.in b/buildroot/package/wireshark/Config.in
similarity index 100%
rename from software/package/wireshark/Config.in
rename to buildroot/package/wireshark/Config.in
diff --git a/software/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash
similarity index 100%
rename from software/package/wireshark/wireshark.hash
rename to buildroot/package/wireshark/wireshark.hash
diff --git a/software/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk
similarity index 100%
rename from software/package/wireshark/wireshark.mk
rename to buildroot/package/wireshark/wireshark.mk
diff --git a/software/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch
similarity index 100%
rename from software/package/wiringpi/0001-Adjust-for-buildroot-build.patch
rename to buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch
diff --git a/software/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch
similarity index 100%
rename from software/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch
rename to buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch
diff --git a/software/package/wiringpi/Config.in b/buildroot/package/wiringpi/Config.in
similarity index 100%
rename from software/package/wiringpi/Config.in
rename to buildroot/package/wiringpi/Config.in
diff --git a/software/package/wiringpi/wiringpi.hash b/buildroot/package/wiringpi/wiringpi.hash
similarity index 100%
rename from software/package/wiringpi/wiringpi.hash
rename to buildroot/package/wiringpi/wiringpi.hash
diff --git a/software/package/wiringpi/wiringpi.mk b/buildroot/package/wiringpi/wiringpi.mk
similarity index 100%
rename from software/package/wiringpi/wiringpi.mk
rename to buildroot/package/wiringpi/wiringpi.mk
diff --git a/software/package/wmctrl/Config.in b/buildroot/package/wmctrl/Config.in
similarity index 100%
rename from software/package/wmctrl/Config.in
rename to buildroot/package/wmctrl/Config.in
diff --git a/software/package/wmctrl/wmctrl.hash b/buildroot/package/wmctrl/wmctrl.hash
similarity index 100%
rename from software/package/wmctrl/wmctrl.hash
rename to buildroot/package/wmctrl/wmctrl.hash
diff --git a/software/package/wmctrl/wmctrl.mk b/buildroot/package/wmctrl/wmctrl.mk
similarity index 100%
rename from software/package/wmctrl/wmctrl.mk
rename to buildroot/package/wmctrl/wmctrl.mk
diff --git a/software/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch b/buildroot/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch
similarity index 100%
rename from software/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch
rename to buildroot/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch
diff --git a/software/package/woff2/Config.in b/buildroot/package/woff2/Config.in
similarity index 100%
rename from software/package/woff2/Config.in
rename to buildroot/package/woff2/Config.in
diff --git a/software/package/woff2/woff2.hash b/buildroot/package/woff2/woff2.hash
similarity index 100%
rename from software/package/woff2/woff2.hash
rename to buildroot/package/woff2/woff2.hash
diff --git a/software/package/woff2/woff2.mk b/buildroot/package/woff2/woff2.mk
similarity index 100%
rename from software/package/woff2/woff2.mk
rename to buildroot/package/woff2/woff2.mk
diff --git a/software/package/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-endian.patch b/buildroot/package/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-endian.patch
similarity index 100%
rename from software/package/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-endian.patch
rename to buildroot/package/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-endian.patch
diff --git a/software/package/wolfssl/Config.in b/buildroot/package/wolfssl/Config.in
similarity index 100%
rename from software/package/wolfssl/Config.in
rename to buildroot/package/wolfssl/Config.in
diff --git a/software/package/wolfssl/wolfssl.hash b/buildroot/package/wolfssl/wolfssl.hash
similarity index 100%
rename from software/package/wolfssl/wolfssl.hash
rename to buildroot/package/wolfssl/wolfssl.hash
diff --git a/software/package/wolfssl/wolfssl.mk b/buildroot/package/wolfssl/wolfssl.mk
similarity index 100%
rename from software/package/wolfssl/wolfssl.mk
rename to buildroot/package/wolfssl/wolfssl.mk
diff --git a/software/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/buildroot/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
similarity index 100%
rename from software/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
rename to buildroot/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
diff --git a/software/package/wpa_supplicant/50-wpa_supplicant.preset b/buildroot/package/wpa_supplicant/50-wpa_supplicant.preset
similarity index 100%
rename from software/package/wpa_supplicant/50-wpa_supplicant.preset
rename to buildroot/package/wpa_supplicant/50-wpa_supplicant.preset
diff --git a/software/package/wpa_supplicant/Config.in b/buildroot/package/wpa_supplicant/Config.in
similarity index 100%
rename from software/package/wpa_supplicant/Config.in
rename to buildroot/package/wpa_supplicant/Config.in
diff --git a/software/package/wpa_supplicant/wpa_supplicant.conf b/buildroot/package/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from software/package/wpa_supplicant/wpa_supplicant.conf
rename to buildroot/package/wpa_supplicant/wpa_supplicant.conf
diff --git a/software/package/wpa_supplicant/wpa_supplicant.hash b/buildroot/package/wpa_supplicant/wpa_supplicant.hash
similarity index 100%
rename from software/package/wpa_supplicant/wpa_supplicant.hash
rename to buildroot/package/wpa_supplicant/wpa_supplicant.hash
diff --git a/software/package/wpa_supplicant/wpa_supplicant.mk b/buildroot/package/wpa_supplicant/wpa_supplicant.mk
similarity index 100%
rename from software/package/wpa_supplicant/wpa_supplicant.mk
rename to buildroot/package/wpa_supplicant/wpa_supplicant.mk
diff --git a/software/package/wpan-tools/Config.in b/buildroot/package/wpan-tools/Config.in
similarity index 100%
rename from software/package/wpan-tools/Config.in
rename to buildroot/package/wpan-tools/Config.in
diff --git a/software/package/wpan-tools/wpan-tools.hash b/buildroot/package/wpan-tools/wpan-tools.hash
similarity index 100%
rename from software/package/wpan-tools/wpan-tools.hash
rename to buildroot/package/wpan-tools/wpan-tools.hash
diff --git a/software/package/wpan-tools/wpan-tools.mk b/buildroot/package/wpan-tools/wpan-tools.mk
similarity index 100%
rename from software/package/wpan-tools/wpan-tools.mk
rename to buildroot/package/wpan-tools/wpan-tools.mk
diff --git a/software/package/wpebackend-fdo/Config.in b/buildroot/package/wpebackend-fdo/Config.in
similarity index 100%
rename from software/package/wpebackend-fdo/Config.in
rename to buildroot/package/wpebackend-fdo/Config.in
diff --git a/software/package/wpebackend-fdo/wpebackend-fdo.hash b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash
similarity index 100%
rename from software/package/wpebackend-fdo/wpebackend-fdo.hash
rename to buildroot/package/wpebackend-fdo/wpebackend-fdo.hash
diff --git a/software/package/wpebackend-fdo/wpebackend-fdo.mk b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk
similarity index 100%
rename from software/package/wpebackend-fdo/wpebackend-fdo.mk
rename to buildroot/package/wpebackend-fdo/wpebackend-fdo.mk
diff --git a/software/package/wpewebkit/0001-Fix-build-with-musl.patch b/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch
similarity index 100%
rename from software/package/wpewebkit/0001-Fix-build-with-musl.patch
rename to buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch
diff --git a/software/package/wpewebkit/Config.in b/buildroot/package/wpewebkit/Config.in
similarity index 100%
rename from software/package/wpewebkit/Config.in
rename to buildroot/package/wpewebkit/Config.in
diff --git a/software/package/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash
similarity index 100%
rename from software/package/wpewebkit/wpewebkit.hash
rename to buildroot/package/wpewebkit/wpewebkit.hash
diff --git a/software/package/wpewebkit/wpewebkit.mk b/buildroot/package/wpewebkit/wpewebkit.mk
similarity index 100%
rename from software/package/wpewebkit/wpewebkit.mk
rename to buildroot/package/wpewebkit/wpewebkit.mk
diff --git a/software/package/wsapi-fcgi/Config.in b/buildroot/package/wsapi-fcgi/Config.in
similarity index 100%
rename from software/package/wsapi-fcgi/Config.in
rename to buildroot/package/wsapi-fcgi/Config.in
diff --git a/software/package/wsapi-fcgi/wsapi-fcgi.hash b/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
similarity index 100%
rename from software/package/wsapi-fcgi/wsapi-fcgi.hash
rename to buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
diff --git a/software/package/wsapi-fcgi/wsapi-fcgi.mk b/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
similarity index 100%
rename from software/package/wsapi-fcgi/wsapi-fcgi.mk
rename to buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
diff --git a/software/package/wsapi-xavante/Config.in b/buildroot/package/wsapi-xavante/Config.in
similarity index 100%
rename from software/package/wsapi-xavante/Config.in
rename to buildroot/package/wsapi-xavante/Config.in
diff --git a/software/package/wsapi-xavante/wsapi-xavante.hash b/buildroot/package/wsapi-xavante/wsapi-xavante.hash
similarity index 100%
rename from software/package/wsapi-xavante/wsapi-xavante.hash
rename to buildroot/package/wsapi-xavante/wsapi-xavante.hash
diff --git a/software/package/wsapi-xavante/wsapi-xavante.mk b/buildroot/package/wsapi-xavante/wsapi-xavante.mk
similarity index 100%
rename from software/package/wsapi-xavante/wsapi-xavante.mk
rename to buildroot/package/wsapi-xavante/wsapi-xavante.mk
diff --git a/software/package/wsapi/Config.in b/buildroot/package/wsapi/Config.in
similarity index 100%
rename from software/package/wsapi/Config.in
rename to buildroot/package/wsapi/Config.in
diff --git a/software/package/wsapi/wsapi.hash b/buildroot/package/wsapi/wsapi.hash
similarity index 100%
rename from software/package/wsapi/wsapi.hash
rename to buildroot/package/wsapi/wsapi.hash
diff --git a/software/package/wsapi/wsapi.mk b/buildroot/package/wsapi/wsapi.mk
similarity index 100%
rename from software/package/wsapi/wsapi.mk
rename to buildroot/package/wsapi/wsapi.mk
diff --git a/software/package/x11r7/Config.in b/buildroot/package/x11r7/Config.in
similarity index 100%
rename from software/package/x11r7/Config.in
rename to buildroot/package/x11r7/Config.in
diff --git a/software/package/x11r7/libxcb/Config.in b/buildroot/package/x11r7/libxcb/Config.in
similarity index 100%
rename from software/package/x11r7/libxcb/Config.in
rename to buildroot/package/x11r7/libxcb/Config.in
diff --git a/software/package/x11r7/libxcb/libxcb.hash b/buildroot/package/x11r7/libxcb/libxcb.hash
similarity index 100%
rename from software/package/x11r7/libxcb/libxcb.hash
rename to buildroot/package/x11r7/libxcb/libxcb.hash
diff --git a/software/package/x11r7/libxcb/libxcb.mk b/buildroot/package/x11r7/libxcb/libxcb.mk
similarity index 100%
rename from software/package/x11r7/libxcb/libxcb.mk
rename to buildroot/package/x11r7/libxcb/libxcb.mk
diff --git a/software/package/x11r7/mcookie/Config.in b/buildroot/package/x11r7/mcookie/Config.in
similarity index 100%
rename from software/package/x11r7/mcookie/Config.in
rename to buildroot/package/x11r7/mcookie/Config.in
diff --git a/software/package/x11r7/mcookie/mcookie.c b/buildroot/package/x11r7/mcookie/mcookie.c
similarity index 100%
rename from software/package/x11r7/mcookie/mcookie.c
rename to buildroot/package/x11r7/mcookie/mcookie.c
diff --git a/software/package/x11r7/mcookie/mcookie.mk b/buildroot/package/x11r7/mcookie/mcookie.mk
similarity index 100%
rename from software/package/x11r7/mcookie/mcookie.mk
rename to buildroot/package/x11r7/mcookie/mcookie.mk
diff --git a/software/package/x11r7/x11r7.mk b/buildroot/package/x11r7/x11r7.mk
similarity index 100%
rename from software/package/x11r7/x11r7.mk
rename to buildroot/package/x11r7/x11r7.mk
diff --git a/software/package/x11r7/xapp_appres/Config.in b/buildroot/package/x11r7/xapp_appres/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_appres/Config.in
rename to buildroot/package/x11r7/xapp_appres/Config.in
diff --git a/software/package/x11r7/xapp_appres/xapp_appres.hash b/buildroot/package/x11r7/xapp_appres/xapp_appres.hash
similarity index 100%
rename from software/package/x11r7/xapp_appres/xapp_appres.hash
rename to buildroot/package/x11r7/xapp_appres/xapp_appres.hash
diff --git a/software/package/x11r7/xapp_appres/xapp_appres.mk b/buildroot/package/x11r7/xapp_appres/xapp_appres.mk
similarity index 100%
rename from software/package/x11r7/xapp_appres/xapp_appres.mk
rename to buildroot/package/x11r7/xapp_appres/xapp_appres.mk
diff --git a/software/package/x11r7/xapp_bdftopcf/Config.in b/buildroot/package/x11r7/xapp_bdftopcf/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_bdftopcf/Config.in
rename to buildroot/package/x11r7/xapp_bdftopcf/Config.in
diff --git a/software/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash
similarity index 100%
rename from software/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash
rename to buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash
diff --git a/software/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
similarity index 100%
rename from software/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
rename to buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
diff --git a/software/package/x11r7/xapp_beforelight/Config.in b/buildroot/package/x11r7/xapp_beforelight/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_beforelight/Config.in
rename to buildroot/package/x11r7/xapp_beforelight/Config.in
diff --git a/software/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.hash
similarity index 100%
rename from software/package/x11r7/xapp_beforelight/xapp_beforelight.hash
rename to buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.hash
diff --git a/software/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.mk
similarity index 100%
rename from software/package/x11r7/xapp_beforelight/xapp_beforelight.mk
rename to buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.mk
diff --git a/software/package/x11r7/xapp_bitmap/Config.in b/buildroot/package/x11r7/xapp_bitmap/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_bitmap/Config.in
rename to buildroot/package/x11r7/xapp_bitmap/Config.in
diff --git a/software/package/x11r7/xapp_bitmap/xapp_bitmap.hash b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.hash
similarity index 100%
rename from software/package/x11r7/xapp_bitmap/xapp_bitmap.hash
rename to buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.hash
diff --git a/software/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk
similarity index 100%
rename from software/package/x11r7/xapp_bitmap/xapp_bitmap.mk
rename to buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk
diff --git a/software/package/x11r7/xapp_editres/Config.in b/buildroot/package/x11r7/xapp_editres/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_editres/Config.in
rename to buildroot/package/x11r7/xapp_editres/Config.in
diff --git a/software/package/x11r7/xapp_editres/xapp_editres.hash b/buildroot/package/x11r7/xapp_editres/xapp_editres.hash
similarity index 100%
rename from software/package/x11r7/xapp_editres/xapp_editres.hash
rename to buildroot/package/x11r7/xapp_editres/xapp_editres.hash
diff --git a/software/package/x11r7/xapp_editres/xapp_editres.mk b/buildroot/package/x11r7/xapp_editres/xapp_editres.mk
similarity index 100%
rename from software/package/x11r7/xapp_editres/xapp_editres.mk
rename to buildroot/package/x11r7/xapp_editres/xapp_editres.mk
diff --git a/software/package/x11r7/xapp_fonttosfnt/Config.in b/buildroot/package/x11r7/xapp_fonttosfnt/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_fonttosfnt/Config.in
rename to buildroot/package/x11r7/xapp_fonttosfnt/Config.in
diff --git a/software/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash
similarity index 100%
rename from software/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash
rename to buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash
diff --git a/software/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
similarity index 100%
rename from software/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
rename to buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
diff --git a/software/package/x11r7/xapp_fslsfonts/Config.in b/buildroot/package/x11r7/xapp_fslsfonts/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_fslsfonts/Config.in
rename to buildroot/package/x11r7/xapp_fslsfonts/Config.in
diff --git a/software/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash b/buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash
similarity index 100%
rename from software/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash
rename to buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash
diff --git a/software/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
similarity index 100%
rename from software/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
rename to buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
diff --git a/software/package/x11r7/xapp_fstobdf/Config.in b/buildroot/package/x11r7/xapp_fstobdf/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_fstobdf/Config.in
rename to buildroot/package/x11r7/xapp_fstobdf/Config.in
diff --git a/software/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash b/buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash
similarity index 100%
rename from software/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash
rename to buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash
diff --git a/software/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
similarity index 100%
rename from software/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
rename to buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
diff --git a/software/package/x11r7/xapp_iceauth/Config.in b/buildroot/package/x11r7/xapp_iceauth/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_iceauth/Config.in
rename to buildroot/package/x11r7/xapp_iceauth/Config.in
diff --git a/software/package/x11r7/xapp_iceauth/xapp_iceauth.hash b/buildroot/package/x11r7/xapp_iceauth/xapp_iceauth.hash
similarity index 100%
rename from software/package/x11r7/xapp_iceauth/xapp_iceauth.hash
rename to buildroot/package/x11r7/xapp_iceauth/xapp_iceauth.hash
diff --git a/software/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/buildroot/package/x11r7/xapp_iceauth/xapp_iceauth.mk
similarity index 100%
rename from software/package/x11r7/xapp_iceauth/xapp_iceauth.mk
rename to buildroot/package/x11r7/xapp_iceauth/xapp_iceauth.mk
diff --git a/software/package/x11r7/xapp_ico/Config.in b/buildroot/package/x11r7/xapp_ico/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_ico/Config.in
rename to buildroot/package/x11r7/xapp_ico/Config.in
diff --git a/software/package/x11r7/xapp_ico/xapp_ico.hash b/buildroot/package/x11r7/xapp_ico/xapp_ico.hash
similarity index 100%
rename from software/package/x11r7/xapp_ico/xapp_ico.hash
rename to buildroot/package/x11r7/xapp_ico/xapp_ico.hash
diff --git a/software/package/x11r7/xapp_ico/xapp_ico.mk b/buildroot/package/x11r7/xapp_ico/xapp_ico.mk
similarity index 100%
rename from software/package/x11r7/xapp_ico/xapp_ico.mk
rename to buildroot/package/x11r7/xapp_ico/xapp_ico.mk
diff --git a/software/package/x11r7/xapp_listres/Config.in b/buildroot/package/x11r7/xapp_listres/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_listres/Config.in
rename to buildroot/package/x11r7/xapp_listres/Config.in
diff --git a/software/package/x11r7/xapp_listres/xapp_listres.hash b/buildroot/package/x11r7/xapp_listres/xapp_listres.hash
similarity index 100%
rename from software/package/x11r7/xapp_listres/xapp_listres.hash
rename to buildroot/package/x11r7/xapp_listres/xapp_listres.hash
diff --git a/software/package/x11r7/xapp_listres/xapp_listres.mk b/buildroot/package/x11r7/xapp_listres/xapp_listres.mk
similarity index 100%
rename from software/package/x11r7/xapp_listres/xapp_listres.mk
rename to buildroot/package/x11r7/xapp_listres/xapp_listres.mk
diff --git a/software/package/x11r7/xapp_luit/0001-posix-openpt.patch b/buildroot/package/x11r7/xapp_luit/0001-posix-openpt.patch
similarity index 100%
rename from software/package/x11r7/xapp_luit/0001-posix-openpt.patch
rename to buildroot/package/x11r7/xapp_luit/0001-posix-openpt.patch
diff --git a/software/package/x11r7/xapp_luit/Config.in b/buildroot/package/x11r7/xapp_luit/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_luit/Config.in
rename to buildroot/package/x11r7/xapp_luit/Config.in
diff --git a/software/package/x11r7/xapp_luit/xapp_luit.hash b/buildroot/package/x11r7/xapp_luit/xapp_luit.hash
similarity index 100%
rename from software/package/x11r7/xapp_luit/xapp_luit.hash
rename to buildroot/package/x11r7/xapp_luit/xapp_luit.hash
diff --git a/software/package/x11r7/xapp_luit/xapp_luit.mk b/buildroot/package/x11r7/xapp_luit/xapp_luit.mk
similarity index 100%
rename from software/package/x11r7/xapp_luit/xapp_luit.mk
rename to buildroot/package/x11r7/xapp_luit/xapp_luit.mk
diff --git a/software/package/x11r7/xapp_mkfontscale/Config.in b/buildroot/package/x11r7/xapp_mkfontscale/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_mkfontscale/Config.in
rename to buildroot/package/x11r7/xapp_mkfontscale/Config.in
diff --git a/software/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash b/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash
similarity index 100%
rename from software/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash
rename to buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash
diff --git a/software/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
similarity index 100%
rename from software/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
rename to buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
diff --git a/software/package/x11r7/xapp_oclock/Config.in b/buildroot/package/x11r7/xapp_oclock/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_oclock/Config.in
rename to buildroot/package/x11r7/xapp_oclock/Config.in
diff --git a/software/package/x11r7/xapp_oclock/xapp_oclock.hash b/buildroot/package/x11r7/xapp_oclock/xapp_oclock.hash
similarity index 100%
rename from software/package/x11r7/xapp_oclock/xapp_oclock.hash
rename to buildroot/package/x11r7/xapp_oclock/xapp_oclock.hash
diff --git a/software/package/x11r7/xapp_oclock/xapp_oclock.mk b/buildroot/package/x11r7/xapp_oclock/xapp_oclock.mk
similarity index 100%
rename from software/package/x11r7/xapp_oclock/xapp_oclock.mk
rename to buildroot/package/x11r7/xapp_oclock/xapp_oclock.mk
diff --git a/software/package/x11r7/xapp_rgb/Config.in b/buildroot/package/x11r7/xapp_rgb/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_rgb/Config.in
rename to buildroot/package/x11r7/xapp_rgb/Config.in
diff --git a/software/package/x11r7/xapp_rgb/xapp_rgb.hash b/buildroot/package/x11r7/xapp_rgb/xapp_rgb.hash
similarity index 100%
rename from software/package/x11r7/xapp_rgb/xapp_rgb.hash
rename to buildroot/package/x11r7/xapp_rgb/xapp_rgb.hash
diff --git a/software/package/x11r7/xapp_rgb/xapp_rgb.mk b/buildroot/package/x11r7/xapp_rgb/xapp_rgb.mk
similarity index 100%
rename from software/package/x11r7/xapp_rgb/xapp_rgb.mk
rename to buildroot/package/x11r7/xapp_rgb/xapp_rgb.mk
diff --git a/software/package/x11r7/xapp_rstart/Config.in b/buildroot/package/x11r7/xapp_rstart/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_rstart/Config.in
rename to buildroot/package/x11r7/xapp_rstart/Config.in
diff --git a/software/package/x11r7/xapp_rstart/xapp_rstart.hash b/buildroot/package/x11r7/xapp_rstart/xapp_rstart.hash
similarity index 100%
rename from software/package/x11r7/xapp_rstart/xapp_rstart.hash
rename to buildroot/package/x11r7/xapp_rstart/xapp_rstart.hash
diff --git a/software/package/x11r7/xapp_rstart/xapp_rstart.mk b/buildroot/package/x11r7/xapp_rstart/xapp_rstart.mk
similarity index 100%
rename from software/package/x11r7/xapp_rstart/xapp_rstart.mk
rename to buildroot/package/x11r7/xapp_rstart/xapp_rstart.mk
diff --git a/software/package/x11r7/xapp_scripts/Config.in b/buildroot/package/x11r7/xapp_scripts/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_scripts/Config.in
rename to buildroot/package/x11r7/xapp_scripts/Config.in
diff --git a/software/package/x11r7/xapp_scripts/xapp_scripts.hash b/buildroot/package/x11r7/xapp_scripts/xapp_scripts.hash
similarity index 100%
rename from software/package/x11r7/xapp_scripts/xapp_scripts.hash
rename to buildroot/package/x11r7/xapp_scripts/xapp_scripts.hash
diff --git a/software/package/x11r7/xapp_scripts/xapp_scripts.mk b/buildroot/package/x11r7/xapp_scripts/xapp_scripts.mk
similarity index 100%
rename from software/package/x11r7/xapp_scripts/xapp_scripts.mk
rename to buildroot/package/x11r7/xapp_scripts/xapp_scripts.mk
diff --git a/software/package/x11r7/xapp_sessreg/Config.in b/buildroot/package/x11r7/xapp_sessreg/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_sessreg/Config.in
rename to buildroot/package/x11r7/xapp_sessreg/Config.in
diff --git a/software/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash
similarity index 100%
rename from software/package/x11r7/xapp_sessreg/xapp_sessreg.hash
rename to buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash
diff --git a/software/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk
similarity index 100%
rename from software/package/x11r7/xapp_sessreg/xapp_sessreg.mk
rename to buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk
diff --git a/software/package/x11r7/xapp_setxkbmap/Config.in b/buildroot/package/x11r7/xapp_setxkbmap/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_setxkbmap/Config.in
rename to buildroot/package/x11r7/xapp_setxkbmap/Config.in
diff --git a/software/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash b/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash
similarity index 100%
rename from software/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash
rename to buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash
diff --git a/software/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
similarity index 100%
rename from software/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
rename to buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
diff --git a/software/package/x11r7/xapp_showfont/Config.in b/buildroot/package/x11r7/xapp_showfont/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_showfont/Config.in
rename to buildroot/package/x11r7/xapp_showfont/Config.in
diff --git a/software/package/x11r7/xapp_showfont/xapp_showfont.hash b/buildroot/package/x11r7/xapp_showfont/xapp_showfont.hash
similarity index 100%
rename from software/package/x11r7/xapp_showfont/xapp_showfont.hash
rename to buildroot/package/x11r7/xapp_showfont/xapp_showfont.hash
diff --git a/software/package/x11r7/xapp_showfont/xapp_showfont.mk b/buildroot/package/x11r7/xapp_showfont/xapp_showfont.mk
similarity index 100%
rename from software/package/x11r7/xapp_showfont/xapp_showfont.mk
rename to buildroot/package/x11r7/xapp_showfont/xapp_showfont.mk
diff --git a/software/package/x11r7/xapp_smproxy/Config.in b/buildroot/package/x11r7/xapp_smproxy/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_smproxy/Config.in
rename to buildroot/package/x11r7/xapp_smproxy/Config.in
diff --git a/software/package/x11r7/xapp_smproxy/xapp_smproxy.hash b/buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.hash
similarity index 100%
rename from software/package/x11r7/xapp_smproxy/xapp_smproxy.hash
rename to buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.hash
diff --git a/software/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.mk
similarity index 100%
rename from software/package/x11r7/xapp_smproxy/xapp_smproxy.mk
rename to buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.mk
diff --git a/software/package/x11r7/xapp_twm/Config.in b/buildroot/package/x11r7/xapp_twm/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_twm/Config.in
rename to buildroot/package/x11r7/xapp_twm/Config.in
diff --git a/software/package/x11r7/xapp_twm/xapp_twm.hash b/buildroot/package/x11r7/xapp_twm/xapp_twm.hash
similarity index 100%
rename from software/package/x11r7/xapp_twm/xapp_twm.hash
rename to buildroot/package/x11r7/xapp_twm/xapp_twm.hash
diff --git a/software/package/x11r7/xapp_twm/xapp_twm.mk b/buildroot/package/x11r7/xapp_twm/xapp_twm.mk
similarity index 100%
rename from software/package/x11r7/xapp_twm/xapp_twm.mk
rename to buildroot/package/x11r7/xapp_twm/xapp_twm.mk
diff --git a/software/package/x11r7/xapp_viewres/Config.in b/buildroot/package/x11r7/xapp_viewres/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_viewres/Config.in
rename to buildroot/package/x11r7/xapp_viewres/Config.in
diff --git a/software/package/x11r7/xapp_viewres/xapp_viewres.hash b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.hash
similarity index 100%
rename from software/package/x11r7/xapp_viewres/xapp_viewres.hash
rename to buildroot/package/x11r7/xapp_viewres/xapp_viewres.hash
diff --git a/software/package/x11r7/xapp_viewres/xapp_viewres.mk b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk
similarity index 100%
rename from software/package/x11r7/xapp_viewres/xapp_viewres.mk
rename to buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk
diff --git a/software/package/x11r7/xapp_x11perf/Config.in b/buildroot/package/x11r7/xapp_x11perf/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_x11perf/Config.in
rename to buildroot/package/x11r7/xapp_x11perf/Config.in
diff --git a/software/package/x11r7/xapp_x11perf/xapp_x11perf.hash b/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.hash
similarity index 100%
rename from software/package/x11r7/xapp_x11perf/xapp_x11perf.hash
rename to buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.hash
diff --git a/software/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.mk
similarity index 100%
rename from software/package/x11r7/xapp_x11perf/xapp_x11perf.mk
rename to buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.mk
diff --git a/software/package/x11r7/xapp_xauth/Config.in b/buildroot/package/x11r7/xapp_xauth/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xauth/Config.in
rename to buildroot/package/x11r7/xapp_xauth/Config.in
diff --git a/software/package/x11r7/xapp_xauth/xapp_xauth.hash b/buildroot/package/x11r7/xapp_xauth/xapp_xauth.hash
similarity index 100%
rename from software/package/x11r7/xapp_xauth/xapp_xauth.hash
rename to buildroot/package/x11r7/xapp_xauth/xapp_xauth.hash
diff --git a/software/package/x11r7/xapp_xauth/xapp_xauth.mk b/buildroot/package/x11r7/xapp_xauth/xapp_xauth.mk
similarity index 100%
rename from software/package/x11r7/xapp_xauth/xapp_xauth.mk
rename to buildroot/package/x11r7/xapp_xauth/xapp_xauth.mk
diff --git a/software/package/x11r7/xapp_xbacklight/Config.in b/buildroot/package/x11r7/xapp_xbacklight/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xbacklight/Config.in
rename to buildroot/package/x11r7/xapp_xbacklight/Config.in
diff --git a/software/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash b/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash
similarity index 100%
rename from software/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash
rename to buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash
diff --git a/software/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
similarity index 100%
rename from software/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
rename to buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
diff --git a/software/package/x11r7/xapp_xbiff/Config.in b/buildroot/package/x11r7/xapp_xbiff/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xbiff/Config.in
rename to buildroot/package/x11r7/xapp_xbiff/Config.in
diff --git a/software/package/x11r7/xapp_xbiff/xapp_xbiff.hash b/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.hash
similarity index 100%
rename from software/package/x11r7/xapp_xbiff/xapp_xbiff.hash
rename to buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.hash
diff --git a/software/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.mk
similarity index 100%
rename from software/package/x11r7/xapp_xbiff/xapp_xbiff.mk
rename to buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.mk
diff --git a/software/package/x11r7/xapp_xcalc/Config.in b/buildroot/package/x11r7/xapp_xcalc/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xcalc/Config.in
rename to buildroot/package/x11r7/xapp_xcalc/Config.in
diff --git a/software/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.hash
similarity index 100%
rename from software/package/x11r7/xapp_xcalc/xapp_xcalc.hash
rename to buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.hash
diff --git a/software/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk
similarity index 100%
rename from software/package/x11r7/xapp_xcalc/xapp_xcalc.mk
rename to buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk
diff --git a/software/package/x11r7/xapp_xclipboard/Config.in b/buildroot/package/x11r7/xapp_xclipboard/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xclipboard/Config.in
rename to buildroot/package/x11r7/xapp_xclipboard/Config.in
diff --git a/software/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash b/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash
similarity index 100%
rename from software/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash
rename to buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash
diff --git a/software/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
similarity index 100%
rename from software/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
rename to buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
diff --git a/software/package/x11r7/xapp_xclock/Config.in b/buildroot/package/x11r7/xapp_xclock/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xclock/Config.in
rename to buildroot/package/x11r7/xapp_xclock/Config.in
diff --git a/software/package/x11r7/xapp_xclock/xapp_xclock.hash b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.hash
similarity index 100%
rename from software/package/x11r7/xapp_xclock/xapp_xclock.hash
rename to buildroot/package/x11r7/xapp_xclock/xapp_xclock.hash
diff --git a/software/package/x11r7/xapp_xclock/xapp_xclock.mk b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk
similarity index 100%
rename from software/package/x11r7/xapp_xclock/xapp_xclock.mk
rename to buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk
diff --git a/software/package/x11r7/xapp_xcmsdb/Config.in b/buildroot/package/x11r7/xapp_xcmsdb/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xcmsdb/Config.in
rename to buildroot/package/x11r7/xapp_xcmsdb/Config.in
diff --git a/software/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash b/buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash
similarity index 100%
rename from software/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash
rename to buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash
diff --git a/software/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
similarity index 100%
rename from software/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
rename to buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
diff --git a/software/package/x11r7/xapp_xcompmgr/Config.in b/buildroot/package/x11r7/xapp_xcompmgr/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xcompmgr/Config.in
rename to buildroot/package/x11r7/xapp_xcompmgr/Config.in
diff --git a/software/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash b/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash
similarity index 100%
rename from software/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash
rename to buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash
diff --git a/software/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk b/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk
similarity index 100%
rename from software/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk
rename to buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk
diff --git a/software/package/x11r7/xapp_xconsole/Config.in b/buildroot/package/x11r7/xapp_xconsole/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xconsole/Config.in
rename to buildroot/package/x11r7/xapp_xconsole/Config.in
diff --git a/software/package/x11r7/xapp_xconsole/xapp_xconsole.hash b/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.hash
similarity index 100%
rename from software/package/x11r7/xapp_xconsole/xapp_xconsole.hash
rename to buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.hash
diff --git a/software/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.mk
similarity index 100%
rename from software/package/x11r7/xapp_xconsole/xapp_xconsole.mk
rename to buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.mk
diff --git a/software/package/x11r7/xapp_xcursorgen/Config.in b/buildroot/package/x11r7/xapp_xcursorgen/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xcursorgen/Config.in
rename to buildroot/package/x11r7/xapp_xcursorgen/Config.in
diff --git a/software/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash b/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash
similarity index 100%
rename from software/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash
rename to buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash
diff --git a/software/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
similarity index 100%
rename from software/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
rename to buildroot/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
diff --git a/software/package/x11r7/xapp_xdbedizzy/Config.in b/buildroot/package/x11r7/xapp_xdbedizzy/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xdbedizzy/Config.in
rename to buildroot/package/x11r7/xapp_xdbedizzy/Config.in
diff --git a/software/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash b/buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash
similarity index 100%
rename from software/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash
rename to buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash
diff --git a/software/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
similarity index 100%
rename from software/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
rename to buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
diff --git a/software/package/x11r7/xapp_xditview/Config.in b/buildroot/package/x11r7/xapp_xditview/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xditview/Config.in
rename to buildroot/package/x11r7/xapp_xditview/Config.in
diff --git a/software/package/x11r7/xapp_xditview/xapp_xditview.hash b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.hash
similarity index 100%
rename from software/package/x11r7/xapp_xditview/xapp_xditview.hash
rename to buildroot/package/x11r7/xapp_xditview/xapp_xditview.hash
diff --git a/software/package/x11r7/xapp_xditview/xapp_xditview.mk b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk
similarity index 100%
rename from software/package/x11r7/xapp_xditview/xapp_xditview.mk
rename to buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk
diff --git a/software/package/x11r7/xapp_xdm/Config.in b/buildroot/package/x11r7/xapp_xdm/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xdm/Config.in
rename to buildroot/package/x11r7/xapp_xdm/Config.in
diff --git a/software/package/x11r7/xapp_xdm/S99xdm b/buildroot/package/x11r7/xapp_xdm/S99xdm
similarity index 100%
rename from software/package/x11r7/xapp_xdm/S99xdm
rename to buildroot/package/x11r7/xapp_xdm/S99xdm
diff --git a/software/package/x11r7/xapp_xdm/xapp_xdm.hash b/buildroot/package/x11r7/xapp_xdm/xapp_xdm.hash
similarity index 100%
rename from software/package/x11r7/xapp_xdm/xapp_xdm.hash
rename to buildroot/package/x11r7/xapp_xdm/xapp_xdm.hash
diff --git a/software/package/x11r7/xapp_xdm/xapp_xdm.mk b/buildroot/package/x11r7/xapp_xdm/xapp_xdm.mk
similarity index 100%
rename from software/package/x11r7/xapp_xdm/xapp_xdm.mk
rename to buildroot/package/x11r7/xapp_xdm/xapp_xdm.mk
diff --git a/software/package/x11r7/xapp_xdpyinfo/Config.in b/buildroot/package/x11r7/xapp_xdpyinfo/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xdpyinfo/Config.in
rename to buildroot/package/x11r7/xapp_xdpyinfo/Config.in
diff --git a/software/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash b/buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash
similarity index 100%
rename from software/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash
rename to buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash
diff --git a/software/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
similarity index 100%
rename from software/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
rename to buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
diff --git a/software/package/x11r7/xapp_xdriinfo/Config.in b/buildroot/package/x11r7/xapp_xdriinfo/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xdriinfo/Config.in
rename to buildroot/package/x11r7/xapp_xdriinfo/Config.in
diff --git a/software/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/buildroot/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash
similarity index 100%
rename from software/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash
rename to buildroot/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash
diff --git a/software/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/buildroot/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
similarity index 100%
rename from software/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
rename to buildroot/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
diff --git a/software/package/x11r7/xapp_xedit/Config.in b/buildroot/package/x11r7/xapp_xedit/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xedit/Config.in
rename to buildroot/package/x11r7/xapp_xedit/Config.in
diff --git a/software/package/x11r7/xapp_xedit/xapp_xedit.hash b/buildroot/package/x11r7/xapp_xedit/xapp_xedit.hash
similarity index 100%
rename from software/package/x11r7/xapp_xedit/xapp_xedit.hash
rename to buildroot/package/x11r7/xapp_xedit/xapp_xedit.hash
diff --git a/software/package/x11r7/xapp_xedit/xapp_xedit.mk b/buildroot/package/x11r7/xapp_xedit/xapp_xedit.mk
similarity index 100%
rename from software/package/x11r7/xapp_xedit/xapp_xedit.mk
rename to buildroot/package/x11r7/xapp_xedit/xapp_xedit.mk
diff --git a/software/package/x11r7/xapp_xev/Config.in b/buildroot/package/x11r7/xapp_xev/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xev/Config.in
rename to buildroot/package/x11r7/xapp_xev/Config.in
diff --git a/software/package/x11r7/xapp_xev/xapp_xev.hash b/buildroot/package/x11r7/xapp_xev/xapp_xev.hash
similarity index 100%
rename from software/package/x11r7/xapp_xev/xapp_xev.hash
rename to buildroot/package/x11r7/xapp_xev/xapp_xev.hash
diff --git a/software/package/x11r7/xapp_xev/xapp_xev.mk b/buildroot/package/x11r7/xapp_xev/xapp_xev.mk
similarity index 100%
rename from software/package/x11r7/xapp_xev/xapp_xev.mk
rename to buildroot/package/x11r7/xapp_xev/xapp_xev.mk
diff --git a/software/package/x11r7/xapp_xeyes/Config.in b/buildroot/package/x11r7/xapp_xeyes/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xeyes/Config.in
rename to buildroot/package/x11r7/xapp_xeyes/Config.in
diff --git a/software/package/x11r7/xapp_xeyes/xapp_xeyes.hash b/buildroot/package/x11r7/xapp_xeyes/xapp_xeyes.hash
similarity index 100%
rename from software/package/x11r7/xapp_xeyes/xapp_xeyes.hash
rename to buildroot/package/x11r7/xapp_xeyes/xapp_xeyes.hash
diff --git a/software/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/buildroot/package/x11r7/xapp_xeyes/xapp_xeyes.mk
similarity index 100%
rename from software/package/x11r7/xapp_xeyes/xapp_xeyes.mk
rename to buildroot/package/x11r7/xapp_xeyes/xapp_xeyes.mk
diff --git a/software/package/x11r7/xapp_xf86dga/Config.in b/buildroot/package/x11r7/xapp_xf86dga/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xf86dga/Config.in
rename to buildroot/package/x11r7/xapp_xf86dga/Config.in
diff --git a/software/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash b/buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash
similarity index 100%
rename from software/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash
rename to buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash
diff --git a/software/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
similarity index 100%
rename from software/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
rename to buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
diff --git a/software/package/x11r7/xapp_xfd/Config.in b/buildroot/package/x11r7/xapp_xfd/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xfd/Config.in
rename to buildroot/package/x11r7/xapp_xfd/Config.in
diff --git a/software/package/x11r7/xapp_xfd/xapp_xfd.hash b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.hash
similarity index 100%
rename from software/package/x11r7/xapp_xfd/xapp_xfd.hash
rename to buildroot/package/x11r7/xapp_xfd/xapp_xfd.hash
diff --git a/software/package/x11r7/xapp_xfd/xapp_xfd.mk b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk
similarity index 100%
rename from software/package/x11r7/xapp_xfd/xapp_xfd.mk
rename to buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk
diff --git a/software/package/x11r7/xapp_xfindproxy/Config.in b/buildroot/package/x11r7/xapp_xfindproxy/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xfindproxy/Config.in
rename to buildroot/package/x11r7/xapp_xfindproxy/Config.in
diff --git a/software/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash b/buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash
similarity index 100%
rename from software/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash
rename to buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash
diff --git a/software/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
similarity index 100%
rename from software/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
rename to buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
diff --git a/software/package/x11r7/xapp_xfontsel/Config.in b/buildroot/package/x11r7/xapp_xfontsel/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xfontsel/Config.in
rename to buildroot/package/x11r7/xapp_xfontsel/Config.in
diff --git a/software/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash b/buildroot/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash
similarity index 100%
rename from software/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash
rename to buildroot/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash
diff --git a/software/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/buildroot/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
similarity index 100%
rename from software/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
rename to buildroot/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
diff --git a/software/package/x11r7/xapp_xfs/Config.in b/buildroot/package/x11r7/xapp_xfs/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xfs/Config.in
rename to buildroot/package/x11r7/xapp_xfs/Config.in
diff --git a/software/package/x11r7/xapp_xfs/xapp_xfs.hash b/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash
similarity index 100%
rename from software/package/x11r7/xapp_xfs/xapp_xfs.hash
rename to buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash
diff --git a/software/package/x11r7/xapp_xfs/xapp_xfs.mk b/buildroot/package/x11r7/xapp_xfs/xapp_xfs.mk
similarity index 100%
rename from software/package/x11r7/xapp_xfs/xapp_xfs.mk
rename to buildroot/package/x11r7/xapp_xfs/xapp_xfs.mk
diff --git a/software/package/x11r7/xapp_xfsinfo/Config.in b/buildroot/package/x11r7/xapp_xfsinfo/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xfsinfo/Config.in
rename to buildroot/package/x11r7/xapp_xfsinfo/Config.in
diff --git a/software/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash
similarity index 100%
rename from software/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash
rename to buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash
diff --git a/software/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
similarity index 100%
rename from software/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
rename to buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
diff --git a/software/package/x11r7/xapp_xgamma/Config.in b/buildroot/package/x11r7/xapp_xgamma/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xgamma/Config.in
rename to buildroot/package/x11r7/xapp_xgamma/Config.in
diff --git a/software/package/x11r7/xapp_xgamma/xapp_xgamma.hash b/buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.hash
similarity index 100%
rename from software/package/x11r7/xapp_xgamma/xapp_xgamma.hash
rename to buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.hash
diff --git a/software/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.mk
similarity index 100%
rename from software/package/x11r7/xapp_xgamma/xapp_xgamma.mk
rename to buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.mk
diff --git a/software/package/x11r7/xapp_xgc/Config.in b/buildroot/package/x11r7/xapp_xgc/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xgc/Config.in
rename to buildroot/package/x11r7/xapp_xgc/Config.in
diff --git a/software/package/x11r7/xapp_xgc/xapp_xgc.hash b/buildroot/package/x11r7/xapp_xgc/xapp_xgc.hash
similarity index 100%
rename from software/package/x11r7/xapp_xgc/xapp_xgc.hash
rename to buildroot/package/x11r7/xapp_xgc/xapp_xgc.hash
diff --git a/software/package/x11r7/xapp_xgc/xapp_xgc.mk b/buildroot/package/x11r7/xapp_xgc/xapp_xgc.mk
similarity index 100%
rename from software/package/x11r7/xapp_xgc/xapp_xgc.mk
rename to buildroot/package/x11r7/xapp_xgc/xapp_xgc.mk
diff --git a/software/package/x11r7/xapp_xhost/Config.in b/buildroot/package/x11r7/xapp_xhost/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xhost/Config.in
rename to buildroot/package/x11r7/xapp_xhost/Config.in
diff --git a/software/package/x11r7/xapp_xhost/xapp_xhost.hash b/buildroot/package/x11r7/xapp_xhost/xapp_xhost.hash
similarity index 100%
rename from software/package/x11r7/xapp_xhost/xapp_xhost.hash
rename to buildroot/package/x11r7/xapp_xhost/xapp_xhost.hash
diff --git a/software/package/x11r7/xapp_xhost/xapp_xhost.mk b/buildroot/package/x11r7/xapp_xhost/xapp_xhost.mk
similarity index 100%
rename from software/package/x11r7/xapp_xhost/xapp_xhost.mk
rename to buildroot/package/x11r7/xapp_xhost/xapp_xhost.mk
diff --git a/software/package/x11r7/xapp_xinit/Config.in b/buildroot/package/x11r7/xapp_xinit/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xinit/Config.in
rename to buildroot/package/x11r7/xapp_xinit/Config.in
diff --git a/software/package/x11r7/xapp_xinit/xapp_xinit.hash b/buildroot/package/x11r7/xapp_xinit/xapp_xinit.hash
similarity index 100%
rename from software/package/x11r7/xapp_xinit/xapp_xinit.hash
rename to buildroot/package/x11r7/xapp_xinit/xapp_xinit.hash
diff --git a/software/package/x11r7/xapp_xinit/xapp_xinit.mk b/buildroot/package/x11r7/xapp_xinit/xapp_xinit.mk
similarity index 100%
rename from software/package/x11r7/xapp_xinit/xapp_xinit.mk
rename to buildroot/package/x11r7/xapp_xinit/xapp_xinit.mk
diff --git a/software/package/x11r7/xapp_xinput-calibrator/Config.in b/buildroot/package/x11r7/xapp_xinput-calibrator/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xinput-calibrator/Config.in
rename to buildroot/package/x11r7/xapp_xinput-calibrator/Config.in
diff --git a/software/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash b/buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash
similarity index 100%
rename from software/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash
rename to buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash
diff --git a/software/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
similarity index 100%
rename from software/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
rename to buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk
diff --git a/software/package/x11r7/xapp_xinput/Config.in b/buildroot/package/x11r7/xapp_xinput/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xinput/Config.in
rename to buildroot/package/x11r7/xapp_xinput/Config.in
diff --git a/software/package/x11r7/xapp_xinput/xapp_xinput.hash b/buildroot/package/x11r7/xapp_xinput/xapp_xinput.hash
similarity index 100%
rename from software/package/x11r7/xapp_xinput/xapp_xinput.hash
rename to buildroot/package/x11r7/xapp_xinput/xapp_xinput.hash
diff --git a/software/package/x11r7/xapp_xinput/xapp_xinput.mk b/buildroot/package/x11r7/xapp_xinput/xapp_xinput.mk
similarity index 100%
rename from software/package/x11r7/xapp_xinput/xapp_xinput.mk
rename to buildroot/package/x11r7/xapp_xinput/xapp_xinput.mk
diff --git a/software/package/x11r7/xapp_xkbcomp/Config.in b/buildroot/package/x11r7/xapp_xkbcomp/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xkbcomp/Config.in
rename to buildroot/package/x11r7/xapp_xkbcomp/Config.in
diff --git a/software/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash
similarity index 100%
rename from software/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash
rename to buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash
diff --git a/software/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
similarity index 100%
rename from software/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
rename to buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
diff --git a/software/package/x11r7/xapp_xkbevd/Config.in b/buildroot/package/x11r7/xapp_xkbevd/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xkbevd/Config.in
rename to buildroot/package/x11r7/xapp_xkbevd/Config.in
diff --git a/software/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash b/buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash
similarity index 100%
rename from software/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash
rename to buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash
diff --git a/software/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
similarity index 100%
rename from software/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
rename to buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
diff --git a/software/package/x11r7/xapp_xkbprint/Config.in b/buildroot/package/x11r7/xapp_xkbprint/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xkbprint/Config.in
rename to buildroot/package/x11r7/xapp_xkbprint/Config.in
diff --git a/software/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash b/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash
similarity index 100%
rename from software/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash
rename to buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash
diff --git a/software/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
similarity index 100%
rename from software/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
rename to buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
diff --git a/software/package/x11r7/xapp_xkbutils/Config.in b/buildroot/package/x11r7/xapp_xkbutils/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xkbutils/Config.in
rename to buildroot/package/x11r7/xapp_xkbutils/Config.in
diff --git a/software/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash b/buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash
similarity index 100%
rename from software/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash
rename to buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash
diff --git a/software/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
similarity index 100%
rename from software/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
rename to buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
diff --git a/software/package/x11r7/xapp_xkill/Config.in b/buildroot/package/x11r7/xapp_xkill/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xkill/Config.in
rename to buildroot/package/x11r7/xapp_xkill/Config.in
diff --git a/software/package/x11r7/xapp_xkill/xapp_xkill.hash b/buildroot/package/x11r7/xapp_xkill/xapp_xkill.hash
similarity index 100%
rename from software/package/x11r7/xapp_xkill/xapp_xkill.hash
rename to buildroot/package/x11r7/xapp_xkill/xapp_xkill.hash
diff --git a/software/package/x11r7/xapp_xkill/xapp_xkill.mk b/buildroot/package/x11r7/xapp_xkill/xapp_xkill.mk
similarity index 100%
rename from software/package/x11r7/xapp_xkill/xapp_xkill.mk
rename to buildroot/package/x11r7/xapp_xkill/xapp_xkill.mk
diff --git a/software/package/x11r7/xapp_xload/Config.in b/buildroot/package/x11r7/xapp_xload/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xload/Config.in
rename to buildroot/package/x11r7/xapp_xload/Config.in
diff --git a/software/package/x11r7/xapp_xload/xapp_xload.hash b/buildroot/package/x11r7/xapp_xload/xapp_xload.hash
similarity index 100%
rename from software/package/x11r7/xapp_xload/xapp_xload.hash
rename to buildroot/package/x11r7/xapp_xload/xapp_xload.hash
diff --git a/software/package/x11r7/xapp_xload/xapp_xload.mk b/buildroot/package/x11r7/xapp_xload/xapp_xload.mk
similarity index 100%
rename from software/package/x11r7/xapp_xload/xapp_xload.mk
rename to buildroot/package/x11r7/xapp_xload/xapp_xload.mk
diff --git a/software/package/x11r7/xapp_xlogo/Config.in b/buildroot/package/x11r7/xapp_xlogo/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xlogo/Config.in
rename to buildroot/package/x11r7/xapp_xlogo/Config.in
diff --git a/software/package/x11r7/xapp_xlogo/xapp_xlogo.hash b/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.hash
similarity index 100%
rename from software/package/x11r7/xapp_xlogo/xapp_xlogo.hash
rename to buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.hash
diff --git a/software/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.mk
similarity index 100%
rename from software/package/x11r7/xapp_xlogo/xapp_xlogo.mk
rename to buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.mk
diff --git a/software/package/x11r7/xapp_xlsatoms/Config.in b/buildroot/package/x11r7/xapp_xlsatoms/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xlsatoms/Config.in
rename to buildroot/package/x11r7/xapp_xlsatoms/Config.in
diff --git a/software/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash
similarity index 100%
rename from software/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash
rename to buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash
diff --git a/software/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
similarity index 100%
rename from software/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
rename to buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
diff --git a/software/package/x11r7/xapp_xlsclients/Config.in b/buildroot/package/x11r7/xapp_xlsclients/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xlsclients/Config.in
rename to buildroot/package/x11r7/xapp_xlsclients/Config.in
diff --git a/software/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash b/buildroot/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash
similarity index 100%
rename from software/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash
rename to buildroot/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash
diff --git a/software/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/buildroot/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
similarity index 100%
rename from software/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
rename to buildroot/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
diff --git a/software/package/x11r7/xapp_xlsfonts/Config.in b/buildroot/package/x11r7/xapp_xlsfonts/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xlsfonts/Config.in
rename to buildroot/package/x11r7/xapp_xlsfonts/Config.in
diff --git a/software/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash b/buildroot/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash
similarity index 100%
rename from software/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash
rename to buildroot/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash
diff --git a/software/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/buildroot/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
similarity index 100%
rename from software/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
rename to buildroot/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
diff --git a/software/package/x11r7/xapp_xmag/Config.in b/buildroot/package/x11r7/xapp_xmag/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xmag/Config.in
rename to buildroot/package/x11r7/xapp_xmag/Config.in
diff --git a/software/package/x11r7/xapp_xmag/xapp_xmag.hash b/buildroot/package/x11r7/xapp_xmag/xapp_xmag.hash
similarity index 100%
rename from software/package/x11r7/xapp_xmag/xapp_xmag.hash
rename to buildroot/package/x11r7/xapp_xmag/xapp_xmag.hash
diff --git a/software/package/x11r7/xapp_xmag/xapp_xmag.mk b/buildroot/package/x11r7/xapp_xmag/xapp_xmag.mk
similarity index 100%
rename from software/package/x11r7/xapp_xmag/xapp_xmag.mk
rename to buildroot/package/x11r7/xapp_xmag/xapp_xmag.mk
diff --git a/software/package/x11r7/xapp_xman/Config.in b/buildroot/package/x11r7/xapp_xman/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xman/Config.in
rename to buildroot/package/x11r7/xapp_xman/Config.in
diff --git a/software/package/x11r7/xapp_xman/xapp_xman.hash b/buildroot/package/x11r7/xapp_xman/xapp_xman.hash
similarity index 100%
rename from software/package/x11r7/xapp_xman/xapp_xman.hash
rename to buildroot/package/x11r7/xapp_xman/xapp_xman.hash
diff --git a/software/package/x11r7/xapp_xman/xapp_xman.mk b/buildroot/package/x11r7/xapp_xman/xapp_xman.mk
similarity index 100%
rename from software/package/x11r7/xapp_xman/xapp_xman.mk
rename to buildroot/package/x11r7/xapp_xman/xapp_xman.mk
diff --git a/software/package/x11r7/xapp_xmessage/Config.in b/buildroot/package/x11r7/xapp_xmessage/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xmessage/Config.in
rename to buildroot/package/x11r7/xapp_xmessage/Config.in
diff --git a/software/package/x11r7/xapp_xmessage/xapp_xmessage.hash b/buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.hash
similarity index 100%
rename from software/package/x11r7/xapp_xmessage/xapp_xmessage.hash
rename to buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.hash
diff --git a/software/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.mk
similarity index 100%
rename from software/package/x11r7/xapp_xmessage/xapp_xmessage.mk
rename to buildroot/package/x11r7/xapp_xmessage/xapp_xmessage.mk
diff --git a/software/package/x11r7/xapp_xmh/Config.in b/buildroot/package/x11r7/xapp_xmh/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xmh/Config.in
rename to buildroot/package/x11r7/xapp_xmh/Config.in
diff --git a/software/package/x11r7/xapp_xmh/xapp_xmh.hash b/buildroot/package/x11r7/xapp_xmh/xapp_xmh.hash
similarity index 100%
rename from software/package/x11r7/xapp_xmh/xapp_xmh.hash
rename to buildroot/package/x11r7/xapp_xmh/xapp_xmh.hash
diff --git a/software/package/x11r7/xapp_xmh/xapp_xmh.mk b/buildroot/package/x11r7/xapp_xmh/xapp_xmh.mk
similarity index 100%
rename from software/package/x11r7/xapp_xmh/xapp_xmh.mk
rename to buildroot/package/x11r7/xapp_xmh/xapp_xmh.mk
diff --git a/software/package/x11r7/xapp_xmodmap/Config.in b/buildroot/package/x11r7/xapp_xmodmap/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xmodmap/Config.in
rename to buildroot/package/x11r7/xapp_xmodmap/Config.in
diff --git a/software/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash b/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash
similarity index 100%
rename from software/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash
rename to buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash
diff --git a/software/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
similarity index 100%
rename from software/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
rename to buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
diff --git a/software/package/x11r7/xapp_xmore/Config.in b/buildroot/package/x11r7/xapp_xmore/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xmore/Config.in
rename to buildroot/package/x11r7/xapp_xmore/Config.in
diff --git a/software/package/x11r7/xapp_xmore/xapp_xmore.hash b/buildroot/package/x11r7/xapp_xmore/xapp_xmore.hash
similarity index 100%
rename from software/package/x11r7/xapp_xmore/xapp_xmore.hash
rename to buildroot/package/x11r7/xapp_xmore/xapp_xmore.hash
diff --git a/software/package/x11r7/xapp_xmore/xapp_xmore.mk b/buildroot/package/x11r7/xapp_xmore/xapp_xmore.mk
similarity index 100%
rename from software/package/x11r7/xapp_xmore/xapp_xmore.mk
rename to buildroot/package/x11r7/xapp_xmore/xapp_xmore.mk
diff --git a/software/package/x11r7/xapp_xpr/Config.in b/buildroot/package/x11r7/xapp_xpr/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xpr/Config.in
rename to buildroot/package/x11r7/xapp_xpr/Config.in
diff --git a/software/package/x11r7/xapp_xpr/xapp_xpr.hash b/buildroot/package/x11r7/xapp_xpr/xapp_xpr.hash
similarity index 100%
rename from software/package/x11r7/xapp_xpr/xapp_xpr.hash
rename to buildroot/package/x11r7/xapp_xpr/xapp_xpr.hash
diff --git a/software/package/x11r7/xapp_xpr/xapp_xpr.mk b/buildroot/package/x11r7/xapp_xpr/xapp_xpr.mk
similarity index 100%
rename from software/package/x11r7/xapp_xpr/xapp_xpr.mk
rename to buildroot/package/x11r7/xapp_xpr/xapp_xpr.mk
diff --git a/software/package/x11r7/xapp_xprop/Config.in b/buildroot/package/x11r7/xapp_xprop/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xprop/Config.in
rename to buildroot/package/x11r7/xapp_xprop/Config.in
diff --git a/software/package/x11r7/xapp_xprop/xapp_xprop.hash b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash
similarity index 100%
rename from software/package/x11r7/xapp_xprop/xapp_xprop.hash
rename to buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash
diff --git a/software/package/x11r7/xapp_xprop/xapp_xprop.mk b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk
similarity index 100%
rename from software/package/x11r7/xapp_xprop/xapp_xprop.mk
rename to buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk
diff --git a/software/package/x11r7/xapp_xrandr/Config.in b/buildroot/package/x11r7/xapp_xrandr/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xrandr/Config.in
rename to buildroot/package/x11r7/xapp_xrandr/Config.in
diff --git a/software/package/x11r7/xapp_xrandr/xapp_xrandr.hash b/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.hash
similarity index 100%
rename from software/package/x11r7/xapp_xrandr/xapp_xrandr.hash
rename to buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.hash
diff --git a/software/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.mk
similarity index 100%
rename from software/package/x11r7/xapp_xrandr/xapp_xrandr.mk
rename to buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.mk
diff --git a/software/package/x11r7/xapp_xrdb/Config.in b/buildroot/package/x11r7/xapp_xrdb/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xrdb/Config.in
rename to buildroot/package/x11r7/xapp_xrdb/Config.in
diff --git a/software/package/x11r7/xapp_xrdb/xapp_xrdb.hash b/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.hash
similarity index 100%
rename from software/package/x11r7/xapp_xrdb/xapp_xrdb.hash
rename to buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.hash
diff --git a/software/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.mk
similarity index 100%
rename from software/package/x11r7/xapp_xrdb/xapp_xrdb.mk
rename to buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.mk
diff --git a/software/package/x11r7/xapp_xrefresh/Config.in b/buildroot/package/x11r7/xapp_xrefresh/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xrefresh/Config.in
rename to buildroot/package/x11r7/xapp_xrefresh/Config.in
diff --git a/software/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash b/buildroot/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash
similarity index 100%
rename from software/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash
rename to buildroot/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash
diff --git a/software/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/buildroot/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
similarity index 100%
rename from software/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
rename to buildroot/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
diff --git a/software/package/x11r7/xapp_xset/Config.in b/buildroot/package/x11r7/xapp_xset/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xset/Config.in
rename to buildroot/package/x11r7/xapp_xset/Config.in
diff --git a/software/package/x11r7/xapp_xset/xapp_xset.hash b/buildroot/package/x11r7/xapp_xset/xapp_xset.hash
similarity index 100%
rename from software/package/x11r7/xapp_xset/xapp_xset.hash
rename to buildroot/package/x11r7/xapp_xset/xapp_xset.hash
diff --git a/software/package/x11r7/xapp_xset/xapp_xset.mk b/buildroot/package/x11r7/xapp_xset/xapp_xset.mk
similarity index 100%
rename from software/package/x11r7/xapp_xset/xapp_xset.mk
rename to buildroot/package/x11r7/xapp_xset/xapp_xset.mk
diff --git a/software/package/x11r7/xapp_xsetmode/Config.in b/buildroot/package/x11r7/xapp_xsetmode/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xsetmode/Config.in
rename to buildroot/package/x11r7/xapp_xsetmode/Config.in
diff --git a/software/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash b/buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash
similarity index 100%
rename from software/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash
rename to buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash
diff --git a/software/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
similarity index 100%
rename from software/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
rename to buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
diff --git a/software/package/x11r7/xapp_xsetpointer/Config.in b/buildroot/package/x11r7/xapp_xsetpointer/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xsetpointer/Config.in
rename to buildroot/package/x11r7/xapp_xsetpointer/Config.in
diff --git a/software/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash b/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash
similarity index 100%
rename from software/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash
rename to buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash
diff --git a/software/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
similarity index 100%
rename from software/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
rename to buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
diff --git a/software/package/x11r7/xapp_xsetroot/Config.in b/buildroot/package/x11r7/xapp_xsetroot/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xsetroot/Config.in
rename to buildroot/package/x11r7/xapp_xsetroot/Config.in
diff --git a/software/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash b/buildroot/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash
similarity index 100%
rename from software/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash
rename to buildroot/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash
diff --git a/software/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/buildroot/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
similarity index 100%
rename from software/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
rename to buildroot/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
diff --git a/software/package/x11r7/xapp_xsm/Config.in b/buildroot/package/x11r7/xapp_xsm/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xsm/Config.in
rename to buildroot/package/x11r7/xapp_xsm/Config.in
diff --git a/software/package/x11r7/xapp_xsm/xapp_xsm.hash b/buildroot/package/x11r7/xapp_xsm/xapp_xsm.hash
similarity index 100%
rename from software/package/x11r7/xapp_xsm/xapp_xsm.hash
rename to buildroot/package/x11r7/xapp_xsm/xapp_xsm.hash
diff --git a/software/package/x11r7/xapp_xsm/xapp_xsm.mk b/buildroot/package/x11r7/xapp_xsm/xapp_xsm.mk
similarity index 100%
rename from software/package/x11r7/xapp_xsm/xapp_xsm.mk
rename to buildroot/package/x11r7/xapp_xsm/xapp_xsm.mk
diff --git a/software/package/x11r7/xapp_xstdcmap/Config.in b/buildroot/package/x11r7/xapp_xstdcmap/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xstdcmap/Config.in
rename to buildroot/package/x11r7/xapp_xstdcmap/Config.in
diff --git a/software/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash
similarity index 100%
rename from software/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash
rename to buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash
diff --git a/software/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
similarity index 100%
rename from software/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
rename to buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
diff --git a/software/package/x11r7/xapp_xvidtune/Config.in b/buildroot/package/x11r7/xapp_xvidtune/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xvidtune/Config.in
rename to buildroot/package/x11r7/xapp_xvidtune/Config.in
diff --git a/software/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash
similarity index 100%
rename from software/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash
rename to buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash
diff --git a/software/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
similarity index 100%
rename from software/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
rename to buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
diff --git a/software/package/x11r7/xapp_xvinfo/Config.in b/buildroot/package/x11r7/xapp_xvinfo/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xvinfo/Config.in
rename to buildroot/package/x11r7/xapp_xvinfo/Config.in
diff --git a/software/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash
similarity index 100%
rename from software/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash
rename to buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash
diff --git a/software/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
similarity index 100%
rename from software/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
rename to buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
diff --git a/software/package/x11r7/xapp_xwd/Config.in b/buildroot/package/x11r7/xapp_xwd/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xwd/Config.in
rename to buildroot/package/x11r7/xapp_xwd/Config.in
diff --git a/software/package/x11r7/xapp_xwd/xapp_xwd.hash b/buildroot/package/x11r7/xapp_xwd/xapp_xwd.hash
similarity index 100%
rename from software/package/x11r7/xapp_xwd/xapp_xwd.hash
rename to buildroot/package/x11r7/xapp_xwd/xapp_xwd.hash
diff --git a/software/package/x11r7/xapp_xwd/xapp_xwd.mk b/buildroot/package/x11r7/xapp_xwd/xapp_xwd.mk
similarity index 100%
rename from software/package/x11r7/xapp_xwd/xapp_xwd.mk
rename to buildroot/package/x11r7/xapp_xwd/xapp_xwd.mk
diff --git a/software/package/x11r7/xapp_xwininfo/Config.in b/buildroot/package/x11r7/xapp_xwininfo/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xwininfo/Config.in
rename to buildroot/package/x11r7/xapp_xwininfo/Config.in
diff --git a/software/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash
similarity index 100%
rename from software/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash
rename to buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash
diff --git a/software/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
similarity index 100%
rename from software/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
rename to buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
diff --git a/software/package/x11r7/xapp_xwud/Config.in b/buildroot/package/x11r7/xapp_xwud/Config.in
similarity index 100%
rename from software/package/x11r7/xapp_xwud/Config.in
rename to buildroot/package/x11r7/xapp_xwud/Config.in
diff --git a/software/package/x11r7/xapp_xwud/xapp_xwud.hash b/buildroot/package/x11r7/xapp_xwud/xapp_xwud.hash
similarity index 100%
rename from software/package/x11r7/xapp_xwud/xapp_xwud.hash
rename to buildroot/package/x11r7/xapp_xwud/xapp_xwud.hash
diff --git a/software/package/x11r7/xapp_xwud/xapp_xwud.mk b/buildroot/package/x11r7/xapp_xwud/xapp_xwud.mk
similarity index 100%
rename from software/package/x11r7/xapp_xwud/xapp_xwud.mk
rename to buildroot/package/x11r7/xapp_xwud/xapp_xwud.mk
diff --git a/software/package/x11r7/xcb-proto/Config.in b/buildroot/package/x11r7/xcb-proto/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-proto/Config.in
rename to buildroot/package/x11r7/xcb-proto/Config.in
diff --git a/software/package/x11r7/xcb-proto/xcb-proto.hash b/buildroot/package/x11r7/xcb-proto/xcb-proto.hash
similarity index 100%
rename from software/package/x11r7/xcb-proto/xcb-proto.hash
rename to buildroot/package/x11r7/xcb-proto/xcb-proto.hash
diff --git a/software/package/x11r7/xcb-proto/xcb-proto.mk b/buildroot/package/x11r7/xcb-proto/xcb-proto.mk
similarity index 100%
rename from software/package/x11r7/xcb-proto/xcb-proto.mk
rename to buildroot/package/x11r7/xcb-proto/xcb-proto.mk
diff --git a/software/package/x11r7/xcb-util-cursor/Config.in b/buildroot/package/x11r7/xcb-util-cursor/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-util-cursor/Config.in
rename to buildroot/package/x11r7/xcb-util-cursor/Config.in
diff --git a/software/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash b/buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash
similarity index 100%
rename from software/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash
rename to buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash
diff --git a/software/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk b/buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk
similarity index 100%
rename from software/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk
rename to buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk
diff --git a/software/package/x11r7/xcb-util-image/Config.in b/buildroot/package/x11r7/xcb-util-image/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-util-image/Config.in
rename to buildroot/package/x11r7/xcb-util-image/Config.in
diff --git a/software/package/x11r7/xcb-util-image/xcb-util-image.hash b/buildroot/package/x11r7/xcb-util-image/xcb-util-image.hash
similarity index 100%
rename from software/package/x11r7/xcb-util-image/xcb-util-image.hash
rename to buildroot/package/x11r7/xcb-util-image/xcb-util-image.hash
diff --git a/software/package/x11r7/xcb-util-image/xcb-util-image.mk b/buildroot/package/x11r7/xcb-util-image/xcb-util-image.mk
similarity index 100%
rename from software/package/x11r7/xcb-util-image/xcb-util-image.mk
rename to buildroot/package/x11r7/xcb-util-image/xcb-util-image.mk
diff --git a/software/package/x11r7/xcb-util-keysyms/Config.in b/buildroot/package/x11r7/xcb-util-keysyms/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-util-keysyms/Config.in
rename to buildroot/package/x11r7/xcb-util-keysyms/Config.in
diff --git a/software/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash b/buildroot/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash
similarity index 100%
rename from software/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash
rename to buildroot/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash
diff --git a/software/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/buildroot/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
similarity index 100%
rename from software/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
rename to buildroot/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk
diff --git a/software/package/x11r7/xcb-util-renderutil/Config.in b/buildroot/package/x11r7/xcb-util-renderutil/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-util-renderutil/Config.in
rename to buildroot/package/x11r7/xcb-util-renderutil/Config.in
diff --git a/software/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash b/buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash
similarity index 100%
rename from software/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash
rename to buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash
diff --git a/software/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk b/buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk
similarity index 100%
rename from software/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk
rename to buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk
diff --git a/software/package/x11r7/xcb-util-wm/Config.in b/buildroot/package/x11r7/xcb-util-wm/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-util-wm/Config.in
rename to buildroot/package/x11r7/xcb-util-wm/Config.in
diff --git a/software/package/x11r7/xcb-util-wm/xcb-util-wm.hash b/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.hash
similarity index 100%
rename from software/package/x11r7/xcb-util-wm/xcb-util-wm.hash
rename to buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.hash
diff --git a/software/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.mk
similarity index 100%
rename from software/package/x11r7/xcb-util-wm/xcb-util-wm.mk
rename to buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.mk
diff --git a/software/package/x11r7/xcb-util/Config.in b/buildroot/package/x11r7/xcb-util/Config.in
similarity index 100%
rename from software/package/x11r7/xcb-util/Config.in
rename to buildroot/package/x11r7/xcb-util/Config.in
diff --git a/software/package/x11r7/xcb-util/xcb-util.hash b/buildroot/package/x11r7/xcb-util/xcb-util.hash
similarity index 100%
rename from software/package/x11r7/xcb-util/xcb-util.hash
rename to buildroot/package/x11r7/xcb-util/xcb-util.hash
diff --git a/software/package/x11r7/xcb-util/xcb-util.mk b/buildroot/package/x11r7/xcb-util/xcb-util.mk
similarity index 100%
rename from software/package/x11r7/xcb-util/xcb-util.mk
rename to buildroot/package/x11r7/xcb-util/xcb-util.mk
diff --git a/software/package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch b/buildroot/package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch
similarity index 100%
rename from software/package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch
rename to buildroot/package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch
diff --git a/software/package/x11r7/xcursor-transparent-theme/Config.in b/buildroot/package/x11r7/xcursor-transparent-theme/Config.in
similarity index 100%
rename from software/package/x11r7/xcursor-transparent-theme/Config.in
rename to buildroot/package/x11r7/xcursor-transparent-theme/Config.in
diff --git a/software/package/x11r7/xcursor-transparent-theme/index.theme b/buildroot/package/x11r7/xcursor-transparent-theme/index.theme
similarity index 100%
rename from software/package/x11r7/xcursor-transparent-theme/index.theme
rename to buildroot/package/x11r7/xcursor-transparent-theme/index.theme
diff --git a/software/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash b/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash
similarity index 100%
rename from software/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash
rename to buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash
diff --git a/software/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
similarity index 100%
rename from software/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
rename to buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
diff --git a/software/package/x11r7/xdata_xbitmaps/Config.in b/buildroot/package/x11r7/xdata_xbitmaps/Config.in
similarity index 100%
rename from software/package/x11r7/xdata_xbitmaps/Config.in
rename to buildroot/package/x11r7/xdata_xbitmaps/Config.in
diff --git a/software/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/buildroot/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash
similarity index 100%
rename from software/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash
rename to buildroot/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash
diff --git a/software/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/buildroot/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
similarity index 100%
rename from software/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
rename to buildroot/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
diff --git a/software/package/x11r7/xdata_xcursor-themes/Config.in b/buildroot/package/x11r7/xdata_xcursor-themes/Config.in
similarity index 100%
rename from software/package/x11r7/xdata_xcursor-themes/Config.in
rename to buildroot/package/x11r7/xdata_xcursor-themes/Config.in
diff --git a/software/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash
similarity index 100%
rename from software/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash
rename to buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash
diff --git a/software/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
similarity index 100%
rename from software/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
rename to buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch b/buildroot/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch
rename to buildroot/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch
diff --git a/software/package/x11r7/xdriver_xf86-input-evdev/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-evdev/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-evdev/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-evdev/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash b/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch b/buildroot/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch
rename to buildroot/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch
diff --git a/software/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf b/buildroot/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf
rename to buildroot/package/x11r7/xdriver_xf86-input-joystick/50-joystick.conf
diff --git a/software/package/x11r7/xdriver_xf86-input-joystick/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-joystick/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-joystick/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-joystick/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-keyboard/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-keyboard/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-keyboard/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch b/buildroot/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch
rename to buildroot/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch
diff --git a/software/package/x11r7/xdriver_xf86-input-libinput/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-libinput/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch b/buildroot/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch
rename to buildroot/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch
diff --git a/software/package/x11r7/xdriver_xf86-input-mouse/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-mouse/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-mouse/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-mouse/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/buildroot/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/buildroot/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch
rename to buildroot/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch
diff --git a/software/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-synaptics/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-synaptics/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-tslib/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-tslib/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-tslib/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-tslib/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash b/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
diff --git a/software/package/x11r7/xdriver_xf86-input-vmmouse/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash b/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash
rename to buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash
diff --git a/software/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
rename to buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch b/buildroot/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-ark/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-ark/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ark/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-ark/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-ast/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-ast/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ast/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-ast/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash b/buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-ati/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-ati/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ati/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-ati/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-cirrus/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-cirrus/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-cirrus/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-cirrus/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash b/buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-dummy/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-dummy/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-dummy/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-dummy/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-fbdev/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbdev/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-fbdev/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-fbturbo/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch b/buildroot/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-geode/0001-Remove-call-to-LoaderGetOS.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch b/buildroot/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-geode/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-geode/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-geode/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-geode/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-geode/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-glint/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-glint/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-glint/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-glint/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-i128/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-i128/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-i128/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-i128/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash b/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch b/buildroot/package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch b/buildroot/package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch b/buildroot/package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch b/buildroot/package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch b/buildroot/package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch b/buildroot/package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-imx/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash b/buildroot/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk b/buildroot/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-intel/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-intel/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-intel/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-intel/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch b/buildroot/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-mach64/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-mach64/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mach64/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-mach64/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash b/buildroot/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/buildroot/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch b/buildroot/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-mga/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-mga/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mga/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-mga/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-neomagic/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-neomagic/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-neomagic/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-nouveau/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-nouveau/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-nouveau/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-nv/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-nv/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-nv/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-nv/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash b/buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-openchrome/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-openchrome/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-qxl/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-qxl/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-qxl/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-qxl/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-r128/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-r128/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-r128/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-r128/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash b/buildroot/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/buildroot/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch b/buildroot/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch b/buildroot/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-savage/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-savage/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-savage/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-savage/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash b/buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash b/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-sis/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-sis/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-sis/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-sis/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash b/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tdfx/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-tdfx/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch b/buildroot/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch
rename to buildroot/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch
diff --git a/software/package/x11r7/xdriver_xf86-video-tga/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-tga/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tga/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-tga/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash b/buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-trident/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-trident/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-trident/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-trident/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-vesa/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-vesa/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-vesa/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-vesa/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-vmware/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-vmware/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-vmware/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-vmware/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash b/buildroot/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash
rename to buildroot/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash
diff --git a/software/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/buildroot/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
diff --git a/software/package/x11r7/xdriver_xf86-video-voodoo/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-voodoo/Config.in
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-voodoo/Config.in
rename to buildroot/package/x11r7/xdriver_xf86-video-voodoo/Config.in
diff --git a/software/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/buildroot/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
similarity index 100%
rename from software/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
rename to buildroot/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
diff --git a/software/package/x11r7/xfont_encodings/Config.in b/buildroot/package/x11r7/xfont_encodings/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_encodings/Config.in
rename to buildroot/package/x11r7/xfont_encodings/Config.in
diff --git a/software/package/x11r7/xfont_encodings/xfont_encodings.hash b/buildroot/package/x11r7/xfont_encodings/xfont_encodings.hash
similarity index 100%
rename from software/package/x11r7/xfont_encodings/xfont_encodings.hash
rename to buildroot/package/x11r7/xfont_encodings/xfont_encodings.hash
diff --git a/software/package/x11r7/xfont_encodings/xfont_encodings.mk b/buildroot/package/x11r7/xfont_encodings/xfont_encodings.mk
similarity index 100%
rename from software/package/x11r7/xfont_encodings/xfont_encodings.mk
rename to buildroot/package/x11r7/xfont_encodings/xfont_encodings.mk
diff --git a/software/package/x11r7/xfont_font-adobe-100dpi/Config.in b/buildroot/package/x11r7/xfont_font-adobe-100dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-100dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-adobe-100dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash
rename to buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash
diff --git a/software/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
rename to buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
diff --git a/software/package/x11r7/xfont_font-adobe-75dpi/Config.in b/buildroot/package/x11r7/xfont_font-adobe-75dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-75dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-adobe-75dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash
rename to buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash
diff --git a/software/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
rename to buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-type1/Config.in b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-type1/Config.in
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-type1/Config.in
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash
diff --git a/software/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
rename to buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
diff --git a/software/package/x11r7/xfont_font-alias/Config.in b/buildroot/package/x11r7/xfont_font-alias/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-alias/Config.in
rename to buildroot/package/x11r7/xfont_font-alias/Config.in
diff --git a/software/package/x11r7/xfont_font-alias/xfont_font-alias.hash b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-alias/xfont_font-alias.hash
rename to buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash
diff --git a/software/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-alias/xfont_font-alias.mk
rename to buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk
diff --git a/software/package/x11r7/xfont_font-arabic-misc/Config.in b/buildroot/package/x11r7/xfont_font-arabic-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-arabic-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-arabic-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash
rename to buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash
diff --git a/software/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
rename to buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
diff --git a/software/package/x11r7/xfont_font-bh-100dpi/Config.in b/buildroot/package/x11r7/xfont_font-bh-100dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-100dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-bh-100dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash
rename to buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash
diff --git a/software/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
rename to buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
diff --git a/software/package/x11r7/xfont_font-bh-75dpi/Config.in b/buildroot/package/x11r7/xfont_font-bh-75dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-75dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-bh-75dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash
rename to buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash
diff --git a/software/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
rename to buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
diff --git a/software/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash
rename to buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash
diff --git a/software/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
rename to buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
diff --git a/software/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash
rename to buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash
diff --git a/software/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
rename to buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
diff --git a/software/package/x11r7/xfont_font-bh-ttf/Config.in b/buildroot/package/x11r7/xfont_font-bh-ttf/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-ttf/Config.in
rename to buildroot/package/x11r7/xfont_font-bh-ttf/Config.in
diff --git a/software/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash b/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash
rename to buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash
diff --git a/software/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
rename to buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
diff --git a/software/package/x11r7/xfont_font-bh-type1/Config.in b/buildroot/package/x11r7/xfont_font-bh-type1/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-type1/Config.in
rename to buildroot/package/x11r7/xfont_font-bh-type1/Config.in
diff --git a/software/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash b/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash
rename to buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash
diff --git a/software/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
rename to buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
diff --git a/software/package/x11r7/xfont_font-bitstream-100dpi/Config.in b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-100dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-bitstream-100dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash
rename to buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash
diff --git a/software/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
rename to buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
diff --git a/software/package/x11r7/xfont_font-bitstream-75dpi/Config.in b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-75dpi/Config.in
rename to buildroot/package/x11r7/xfont_font-bitstream-75dpi/Config.in
diff --git a/software/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash
rename to buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash
diff --git a/software/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
rename to buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
diff --git a/software/package/x11r7/xfont_font-bitstream-type1/Config.in b/buildroot/package/x11r7/xfont_font-bitstream-type1/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-type1/Config.in
rename to buildroot/package/x11r7/xfont_font-bitstream-type1/Config.in
diff --git a/software/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash b/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash
rename to buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash
diff --git a/software/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
rename to buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
diff --git a/software/package/x11r7/xfont_font-cronyx-cyrillic/Config.in b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-cronyx-cyrillic/Config.in
rename to buildroot/package/x11r7/xfont_font-cronyx-cyrillic/Config.in
diff --git a/software/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash
rename to buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash
diff --git a/software/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
rename to buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
diff --git a/software/package/x11r7/xfont_font-cursor-misc/Config.in b/buildroot/package/x11r7/xfont_font-cursor-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-cursor-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-cursor-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash
rename to buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash
diff --git a/software/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
rename to buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
diff --git a/software/package/x11r7/xfont_font-daewoo-misc/Config.in b/buildroot/package/x11r7/xfont_font-daewoo-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-daewoo-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-daewoo-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash b/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash
rename to buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash
diff --git a/software/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
rename to buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
diff --git a/software/package/x11r7/xfont_font-dec-misc/Config.in b/buildroot/package/x11r7/xfont_font-dec-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-dec-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-dec-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash
rename to buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash
diff --git a/software/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
rename to buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
diff --git a/software/package/x11r7/xfont_font-ibm-type1/Config.in b/buildroot/package/x11r7/xfont_font-ibm-type1/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-ibm-type1/Config.in
rename to buildroot/package/x11r7/xfont_font-ibm-type1/Config.in
diff --git a/software/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash b/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash
rename to buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash
diff --git a/software/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
rename to buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
diff --git a/software/package/x11r7/xfont_font-isas-misc/Config.in b/buildroot/package/x11r7/xfont_font-isas-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-isas-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-isas-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash
rename to buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash
diff --git a/software/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
rename to buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
diff --git a/software/package/x11r7/xfont_font-jis-misc/Config.in b/buildroot/package/x11r7/xfont_font-jis-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-jis-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-jis-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash b/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash
rename to buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash
diff --git a/software/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
rename to buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
diff --git a/software/package/x11r7/xfont_font-micro-misc/Config.in b/buildroot/package/x11r7/xfont_font-micro-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-micro-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-micro-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash
rename to buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash
diff --git a/software/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
rename to buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
diff --git a/software/package/x11r7/xfont_font-misc-cyrillic/Config.in b/buildroot/package/x11r7/xfont_font-misc-cyrillic/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-cyrillic/Config.in
rename to buildroot/package/x11r7/xfont_font-misc-cyrillic/Config.in
diff --git a/software/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash
rename to buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash
diff --git a/software/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
rename to buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
diff --git a/software/package/x11r7/xfont_font-misc-ethiopic/Config.in b/buildroot/package/x11r7/xfont_font-misc-ethiopic/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-ethiopic/Config.in
rename to buildroot/package/x11r7/xfont_font-misc-ethiopic/Config.in
diff --git a/software/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash
rename to buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash
diff --git a/software/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
rename to buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
diff --git a/software/package/x11r7/xfont_font-misc-meltho/Config.in b/buildroot/package/x11r7/xfont_font-misc-meltho/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-meltho/Config.in
rename to buildroot/package/x11r7/xfont_font-misc-meltho/Config.in
diff --git a/software/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash b/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash
rename to buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash
diff --git a/software/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
rename to buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
diff --git a/software/package/x11r7/xfont_font-misc-misc/Config.in b/buildroot/package/x11r7/xfont_font-misc-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-misc-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash
rename to buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash
diff --git a/software/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
rename to buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
diff --git a/software/package/x11r7/xfont_font-mutt-misc/Config.in b/buildroot/package/x11r7/xfont_font-mutt-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-mutt-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-mutt-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash
rename to buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash
diff --git a/software/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
rename to buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
diff --git a/software/package/x11r7/xfont_font-schumacher-misc/Config.in b/buildroot/package/x11r7/xfont_font-schumacher-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-schumacher-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-schumacher-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash
rename to buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash
diff --git a/software/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
rename to buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
diff --git a/software/package/x11r7/xfont_font-screen-cyrillic/Config.in b/buildroot/package/x11r7/xfont_font-screen-cyrillic/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-screen-cyrillic/Config.in
rename to buildroot/package/x11r7/xfont_font-screen-cyrillic/Config.in
diff --git a/software/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash
rename to buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash
diff --git a/software/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
rename to buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
diff --git a/software/package/x11r7/xfont_font-sony-misc/Config.in b/buildroot/package/x11r7/xfont_font-sony-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-sony-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-sony-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash
rename to buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash
diff --git a/software/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
rename to buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
diff --git a/software/package/x11r7/xfont_font-sun-misc/Config.in b/buildroot/package/x11r7/xfont_font-sun-misc/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-sun-misc/Config.in
rename to buildroot/package/x11r7/xfont_font-sun-misc/Config.in
diff --git a/software/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash
rename to buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash
diff --git a/software/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
rename to buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
diff --git a/software/package/x11r7/xfont_font-util/Config.in b/buildroot/package/x11r7/xfont_font-util/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-util/Config.in
rename to buildroot/package/x11r7/xfont_font-util/Config.in
diff --git a/software/package/x11r7/xfont_font-util/xfont_font-util.hash b/buildroot/package/x11r7/xfont_font-util/xfont_font-util.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-util/xfont_font-util.hash
rename to buildroot/package/x11r7/xfont_font-util/xfont_font-util.hash
diff --git a/software/package/x11r7/xfont_font-util/xfont_font-util.mk b/buildroot/package/x11r7/xfont_font-util/xfont_font-util.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-util/xfont_font-util.mk
rename to buildroot/package/x11r7/xfont_font-util/xfont_font-util.mk
diff --git a/software/package/x11r7/xfont_font-winitzki-cyrillic/Config.in b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-winitzki-cyrillic/Config.in
rename to buildroot/package/x11r7/xfont_font-winitzki-cyrillic/Config.in
diff --git a/software/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash
rename to buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash
diff --git a/software/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
rename to buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
diff --git a/software/package/x11r7/xfont_font-xfree86-type1/Config.in b/buildroot/package/x11r7/xfont_font-xfree86-type1/Config.in
similarity index 100%
rename from software/package/x11r7/xfont_font-xfree86-type1/Config.in
rename to buildroot/package/x11r7/xfont_font-xfree86-type1/Config.in
diff --git a/software/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash b/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash
similarity index 100%
rename from software/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash
rename to buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash
diff --git a/software/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
similarity index 100%
rename from software/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
rename to buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
diff --git a/software/package/x11r7/xkeyboard-config/Config.in b/buildroot/package/x11r7/xkeyboard-config/Config.in
similarity index 100%
rename from software/package/x11r7/xkeyboard-config/Config.in
rename to buildroot/package/x11r7/xkeyboard-config/Config.in
diff --git a/software/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash
similarity index 100%
rename from software/package/x11r7/xkeyboard-config/xkeyboard-config.hash
rename to buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash
diff --git a/software/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk
similarity index 100%
rename from software/package/x11r7/xkeyboard-config/xkeyboard-config.mk
rename to buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk
diff --git a/software/package/x11r7/xlib_libFS/Config.in b/buildroot/package/x11r7/xlib_libFS/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libFS/Config.in
rename to buildroot/package/x11r7/xlib_libFS/Config.in
diff --git a/software/package/x11r7/xlib_libFS/xlib_libFS.hash b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.hash
similarity index 100%
rename from software/package/x11r7/xlib_libFS/xlib_libFS.hash
rename to buildroot/package/x11r7/xlib_libFS/xlib_libFS.hash
diff --git a/software/package/x11r7/xlib_libFS/xlib_libFS.mk b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk
similarity index 100%
rename from software/package/x11r7/xlib_libFS/xlib_libFS.mk
rename to buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk
diff --git a/software/package/x11r7/xlib_libICE/Config.in b/buildroot/package/x11r7/xlib_libICE/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libICE/Config.in
rename to buildroot/package/x11r7/xlib_libICE/Config.in
diff --git a/software/package/x11r7/xlib_libICE/xlib_libICE.hash b/buildroot/package/x11r7/xlib_libICE/xlib_libICE.hash
similarity index 100%
rename from software/package/x11r7/xlib_libICE/xlib_libICE.hash
rename to buildroot/package/x11r7/xlib_libICE/xlib_libICE.hash
diff --git a/software/package/x11r7/xlib_libICE/xlib_libICE.mk b/buildroot/package/x11r7/xlib_libICE/xlib_libICE.mk
similarity index 100%
rename from software/package/x11r7/xlib_libICE/xlib_libICE.mk
rename to buildroot/package/x11r7/xlib_libICE/xlib_libICE.mk
diff --git a/software/package/x11r7/xlib_libSM/Config.in b/buildroot/package/x11r7/xlib_libSM/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libSM/Config.in
rename to buildroot/package/x11r7/xlib_libSM/Config.in
diff --git a/software/package/x11r7/xlib_libSM/xlib_libSM.hash b/buildroot/package/x11r7/xlib_libSM/xlib_libSM.hash
similarity index 100%
rename from software/package/x11r7/xlib_libSM/xlib_libSM.hash
rename to buildroot/package/x11r7/xlib_libSM/xlib_libSM.hash
diff --git a/software/package/x11r7/xlib_libSM/xlib_libSM.mk b/buildroot/package/x11r7/xlib_libSM/xlib_libSM.mk
similarity index 100%
rename from software/package/x11r7/xlib_libSM/xlib_libSM.mk
rename to buildroot/package/x11r7/xlib_libSM/xlib_libSM.mk
diff --git a/software/package/x11r7/xlib_libX11/Config.in b/buildroot/package/x11r7/xlib_libX11/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libX11/Config.in
rename to buildroot/package/x11r7/xlib_libX11/Config.in
diff --git a/software/package/x11r7/xlib_libX11/xlib_libX11.hash b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash
similarity index 100%
rename from software/package/x11r7/xlib_libX11/xlib_libX11.hash
rename to buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash
diff --git a/software/package/x11r7/xlib_libX11/xlib_libX11.mk b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk
similarity index 100%
rename from software/package/x11r7/xlib_libX11/xlib_libX11.mk
rename to buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk
diff --git a/software/package/x11r7/xlib_libXScrnSaver/Config.in b/buildroot/package/x11r7/xlib_libXScrnSaver/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXScrnSaver/Config.in
rename to buildroot/package/x11r7/xlib_libXScrnSaver/Config.in
diff --git a/software/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash b/buildroot/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash
rename to buildroot/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash
diff --git a/software/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/buildroot/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
rename to buildroot/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
diff --git a/software/package/x11r7/xlib_libXau/Config.in b/buildroot/package/x11r7/xlib_libXau/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXau/Config.in
rename to buildroot/package/x11r7/xlib_libXau/Config.in
diff --git a/software/package/x11r7/xlib_libXau/xlib_libXau.hash b/buildroot/package/x11r7/xlib_libXau/xlib_libXau.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXau/xlib_libXau.hash
rename to buildroot/package/x11r7/xlib_libXau/xlib_libXau.hash
diff --git a/software/package/x11r7/xlib_libXau/xlib_libXau.mk b/buildroot/package/x11r7/xlib_libXau/xlib_libXau.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXau/xlib_libXau.mk
rename to buildroot/package/x11r7/xlib_libXau/xlib_libXau.mk
diff --git a/software/package/x11r7/xlib_libXaw/Config.in b/buildroot/package/x11r7/xlib_libXaw/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXaw/Config.in
rename to buildroot/package/x11r7/xlib_libXaw/Config.in
diff --git a/software/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXaw/xlib_libXaw.hash
rename to buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash
diff --git a/software/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXaw/xlib_libXaw.mk
rename to buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.mk
diff --git a/software/package/x11r7/xlib_libXcomposite/Config.in b/buildroot/package/x11r7/xlib_libXcomposite/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXcomposite/Config.in
rename to buildroot/package/x11r7/xlib_libXcomposite/Config.in
diff --git a/software/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash
rename to buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash
diff --git a/software/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
rename to buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
diff --git a/software/package/x11r7/xlib_libXcursor/Config.in b/buildroot/package/x11r7/xlib_libXcursor/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXcursor/Config.in
rename to buildroot/package/x11r7/xlib_libXcursor/Config.in
diff --git a/software/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash
rename to buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash
diff --git a/software/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
rename to buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
diff --git a/software/package/x11r7/xlib_libXdamage/Config.in b/buildroot/package/x11r7/xlib_libXdamage/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXdamage/Config.in
rename to buildroot/package/x11r7/xlib_libXdamage/Config.in
diff --git a/software/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash
rename to buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash
diff --git a/software/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
rename to buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
diff --git a/software/package/x11r7/xlib_libXdmcp/Config.in b/buildroot/package/x11r7/xlib_libXdmcp/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXdmcp/Config.in
rename to buildroot/package/x11r7/xlib_libXdmcp/Config.in
diff --git a/software/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash
rename to buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash
diff --git a/software/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
rename to buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
diff --git a/software/package/x11r7/xlib_libXext/Config.in b/buildroot/package/x11r7/xlib_libXext/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXext/Config.in
rename to buildroot/package/x11r7/xlib_libXext/Config.in
diff --git a/software/package/x11r7/xlib_libXext/xlib_libXext.hash b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXext/xlib_libXext.hash
rename to buildroot/package/x11r7/xlib_libXext/xlib_libXext.hash
diff --git a/software/package/x11r7/xlib_libXext/xlib_libXext.mk b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXext/xlib_libXext.mk
rename to buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk
diff --git a/software/package/x11r7/xlib_libXfixes/Config.in b/buildroot/package/x11r7/xlib_libXfixes/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXfixes/Config.in
rename to buildroot/package/x11r7/xlib_libXfixes/Config.in
diff --git a/software/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash
rename to buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash
diff --git a/software/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
rename to buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
diff --git a/software/package/x11r7/xlib_libXfont/Config.in b/buildroot/package/x11r7/xlib_libXfont/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXfont/Config.in
rename to buildroot/package/x11r7/xlib_libXfont/Config.in
diff --git a/software/package/x11r7/xlib_libXfont/xlib_libXfont.hash b/buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXfont/xlib_libXfont.hash
rename to buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.hash
diff --git a/software/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXfont/xlib_libXfont.mk
rename to buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.mk
diff --git a/software/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch b/buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch
similarity index 100%
rename from software/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch
rename to buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch
diff --git a/software/package/x11r7/xlib_libXfont2/Config.in b/buildroot/package/x11r7/xlib_libXfont2/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXfont2/Config.in
rename to buildroot/package/x11r7/xlib_libXfont2/Config.in
diff --git a/software/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
rename to buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
diff --git a/software/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
rename to buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
diff --git a/software/package/x11r7/xlib_libXft/Config.in b/buildroot/package/x11r7/xlib_libXft/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXft/Config.in
rename to buildroot/package/x11r7/xlib_libXft/Config.in
diff --git a/software/package/x11r7/xlib_libXft/xlib_libXft.hash b/buildroot/package/x11r7/xlib_libXft/xlib_libXft.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXft/xlib_libXft.hash
rename to buildroot/package/x11r7/xlib_libXft/xlib_libXft.hash
diff --git a/software/package/x11r7/xlib_libXft/xlib_libXft.mk b/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXft/xlib_libXft.mk
rename to buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk
diff --git a/software/package/x11r7/xlib_libXi/Config.in b/buildroot/package/x11r7/xlib_libXi/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXi/Config.in
rename to buildroot/package/x11r7/xlib_libXi/Config.in
diff --git a/software/package/x11r7/xlib_libXi/xlib_libXi.hash b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXi/xlib_libXi.hash
rename to buildroot/package/x11r7/xlib_libXi/xlib_libXi.hash
diff --git a/software/package/x11r7/xlib_libXi/xlib_libXi.mk b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXi/xlib_libXi.mk
rename to buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk
diff --git a/software/package/x11r7/xlib_libXinerama/Config.in b/buildroot/package/x11r7/xlib_libXinerama/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXinerama/Config.in
rename to buildroot/package/x11r7/xlib_libXinerama/Config.in
diff --git a/software/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash b/buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash
rename to buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash
diff --git a/software/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
rename to buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
diff --git a/software/package/x11r7/xlib_libXmu/Config.in b/buildroot/package/x11r7/xlib_libXmu/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXmu/Config.in
rename to buildroot/package/x11r7/xlib_libXmu/Config.in
diff --git a/software/package/x11r7/xlib_libXmu/xlib_libXmu.hash b/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXmu/xlib_libXmu.hash
rename to buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.hash
diff --git a/software/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXmu/xlib_libXmu.mk
rename to buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.mk
diff --git a/software/package/x11r7/xlib_libXpm/Config.in b/buildroot/package/x11r7/xlib_libXpm/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXpm/Config.in
rename to buildroot/package/x11r7/xlib_libXpm/Config.in
diff --git a/software/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXpm/xlib_libXpm.hash
rename to buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.hash
diff --git a/software/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXpm/xlib_libXpm.mk
rename to buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
diff --git a/software/package/x11r7/xlib_libXrandr/Config.in b/buildroot/package/x11r7/xlib_libXrandr/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXrandr/Config.in
rename to buildroot/package/x11r7/xlib_libXrandr/Config.in
diff --git a/software/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash
rename to buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash
diff --git a/software/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
rename to buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
diff --git a/software/package/x11r7/xlib_libXrender/Config.in b/buildroot/package/x11r7/xlib_libXrender/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXrender/Config.in
rename to buildroot/package/x11r7/xlib_libXrender/Config.in
diff --git a/software/package/x11r7/xlib_libXrender/xlib_libXrender.hash b/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXrender/xlib_libXrender.hash
rename to buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.hash
diff --git a/software/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXrender/xlib_libXrender.mk
rename to buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.mk
diff --git a/software/package/x11r7/xlib_libXres/Config.in b/buildroot/package/x11r7/xlib_libXres/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXres/Config.in
rename to buildroot/package/x11r7/xlib_libXres/Config.in
diff --git a/software/package/x11r7/xlib_libXres/xlib_libXres.hash b/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXres/xlib_libXres.hash
rename to buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash
diff --git a/software/package/x11r7/xlib_libXres/xlib_libXres.mk b/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXres/xlib_libXres.mk
rename to buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk
diff --git a/software/package/x11r7/xlib_libXt/Config.in b/buildroot/package/x11r7/xlib_libXt/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXt/Config.in
rename to buildroot/package/x11r7/xlib_libXt/Config.in
diff --git a/software/package/x11r7/xlib_libXt/xlib_libXt.hash b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXt/xlib_libXt.hash
rename to buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash
diff --git a/software/package/x11r7/xlib_libXt/xlib_libXt.mk b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXt/xlib_libXt.mk
rename to buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk
diff --git a/software/package/x11r7/xlib_libXtst/Config.in b/buildroot/package/x11r7/xlib_libXtst/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXtst/Config.in
rename to buildroot/package/x11r7/xlib_libXtst/Config.in
diff --git a/software/package/x11r7/xlib_libXtst/xlib_libXtst.hash b/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXtst/xlib_libXtst.hash
rename to buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.hash
diff --git a/software/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXtst/xlib_libXtst.mk
rename to buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.mk
diff --git a/software/package/x11r7/xlib_libXv/Config.in b/buildroot/package/x11r7/xlib_libXv/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXv/Config.in
rename to buildroot/package/x11r7/xlib_libXv/Config.in
diff --git a/software/package/x11r7/xlib_libXv/xlib_libXv.hash b/buildroot/package/x11r7/xlib_libXv/xlib_libXv.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXv/xlib_libXv.hash
rename to buildroot/package/x11r7/xlib_libXv/xlib_libXv.hash
diff --git a/software/package/x11r7/xlib_libXv/xlib_libXv.mk b/buildroot/package/x11r7/xlib_libXv/xlib_libXv.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXv/xlib_libXv.mk
rename to buildroot/package/x11r7/xlib_libXv/xlib_libXv.mk
diff --git a/software/package/x11r7/xlib_libXvMC/Config.in b/buildroot/package/x11r7/xlib_libXvMC/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXvMC/Config.in
rename to buildroot/package/x11r7/xlib_libXvMC/Config.in
diff --git a/software/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash
rename to buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash
diff --git a/software/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
rename to buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
diff --git a/software/package/x11r7/xlib_libXxf86dga/Config.in b/buildroot/package/x11r7/xlib_libXxf86dga/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXxf86dga/Config.in
rename to buildroot/package/x11r7/xlib_libXxf86dga/Config.in
diff --git a/software/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash
rename to buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash
diff --git a/software/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
rename to buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
diff --git a/software/package/x11r7/xlib_libXxf86vm/Config.in b/buildroot/package/x11r7/xlib_libXxf86vm/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libXxf86vm/Config.in
rename to buildroot/package/x11r7/xlib_libXxf86vm/Config.in
diff --git a/software/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash b/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash
similarity index 100%
rename from software/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash
rename to buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash
diff --git a/software/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
similarity index 100%
rename from software/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
rename to buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
diff --git a/software/package/x11r7/xlib_libdmx/Config.in b/buildroot/package/x11r7/xlib_libdmx/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libdmx/Config.in
rename to buildroot/package/x11r7/xlib_libdmx/Config.in
diff --git a/software/package/x11r7/xlib_libdmx/xlib_libdmx.hash b/buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.hash
similarity index 100%
rename from software/package/x11r7/xlib_libdmx/xlib_libdmx.hash
rename to buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.hash
diff --git a/software/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.mk
similarity index 100%
rename from software/package/x11r7/xlib_libdmx/xlib_libdmx.mk
rename to buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.mk
diff --git a/software/package/x11r7/xlib_libfontenc/Config.in b/buildroot/package/x11r7/xlib_libfontenc/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libfontenc/Config.in
rename to buildroot/package/x11r7/xlib_libfontenc/Config.in
diff --git a/software/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash
similarity index 100%
rename from software/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash
rename to buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash
diff --git a/software/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
similarity index 100%
rename from software/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
rename to buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
diff --git a/software/package/x11r7/xlib_libxkbfile/Config.in b/buildroot/package/x11r7/xlib_libxkbfile/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libxkbfile/Config.in
rename to buildroot/package/x11r7/xlib_libxkbfile/Config.in
diff --git a/software/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash b/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash
similarity index 100%
rename from software/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash
rename to buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash
diff --git a/software/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
similarity index 100%
rename from software/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
rename to buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
diff --git a/software/package/x11r7/xlib_libxshmfence/Config.in b/buildroot/package/x11r7/xlib_libxshmfence/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_libxshmfence/Config.in
rename to buildroot/package/x11r7/xlib_libxshmfence/Config.in
diff --git a/software/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/buildroot/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash
similarity index 100%
rename from software/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash
rename to buildroot/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash
diff --git a/software/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/buildroot/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
similarity index 100%
rename from software/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
rename to buildroot/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
diff --git a/software/package/x11r7/xlib_xtrans/Config.in b/buildroot/package/x11r7/xlib_xtrans/Config.in
similarity index 100%
rename from software/package/x11r7/xlib_xtrans/Config.in
rename to buildroot/package/x11r7/xlib_xtrans/Config.in
diff --git a/software/package/x11r7/xlib_xtrans/xlib_xtrans.hash b/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.hash
similarity index 100%
rename from software/package/x11r7/xlib_xtrans/xlib_xtrans.hash
rename to buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.hash
diff --git a/software/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.mk
similarity index 100%
rename from software/package/x11r7/xlib_xtrans/xlib_xtrans.mk
rename to buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.mk
diff --git a/software/package/x11r7/xorgproto/Config.in b/buildroot/package/x11r7/xorgproto/Config.in
similarity index 100%
rename from software/package/x11r7/xorgproto/Config.in
rename to buildroot/package/x11r7/xorgproto/Config.in
diff --git a/software/package/x11r7/xorgproto/xorgproto.hash b/buildroot/package/x11r7/xorgproto/xorgproto.hash
similarity index 100%
rename from software/package/x11r7/xorgproto/xorgproto.hash
rename to buildroot/package/x11r7/xorgproto/xorgproto.hash
diff --git a/software/package/x11r7/xorgproto/xorgproto.mk b/buildroot/package/x11r7/xorgproto/xorgproto.mk
similarity index 100%
rename from software/package/x11r7/xorgproto/xorgproto.mk
rename to buildroot/package/x11r7/xorgproto/xorgproto.mk
diff --git a/software/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch b/buildroot/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.20.9/0001-modesettings-needs-dri2.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0001-modesettings-needs-dri2.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.20.9/0001-modesettings-needs-dri2.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.9/0001-modesettings-needs-dri2.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.20.9/0002-Remove-check-for-useSIGIO-option.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0002-Remove-check-for-useSIGIO-option.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.20.9/0002-Remove-check-for-useSIGIO-option.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.9/0002-Remove-check-for-useSIGIO-option.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.20.9/0003-include-misc.h-fix-uClibc-build.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0003-include-misc.h-fix-uClibc-build.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.20.9/0003-include-misc.h-fix-uClibc-build.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.9/0003-include-misc.h-fix-uClibc-build.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.20.9/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.20.9/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.9/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.20.9/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.20.9/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.9/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
diff --git a/software/package/x11r7/xserver_xorg-server/1.20.9/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.9/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/1.20.9/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
rename to buildroot/package/x11r7/xserver_xorg-server/1.20.9/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
diff --git a/software/package/x11r7/xserver_xorg-server/Config.in b/buildroot/package/x11r7/xserver_xorg-server/Config.in
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/Config.in
rename to buildroot/package/x11r7/xserver_xorg-server/Config.in
diff --git a/software/package/x11r7/xserver_xorg-server/S40xorg b/buildroot/package/x11r7/xserver_xorg-server/S40xorg
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/S40xorg
rename to buildroot/package/x11r7/xserver_xorg-server/S40xorg
diff --git a/software/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
rename to buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
diff --git a/software/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
similarity index 100%
rename from software/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
rename to buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
diff --git a/software/package/x11r7/xutil_makedepend/Config.in b/buildroot/package/x11r7/xutil_makedepend/Config.in
similarity index 100%
rename from software/package/x11r7/xutil_makedepend/Config.in
rename to buildroot/package/x11r7/xutil_makedepend/Config.in
diff --git a/software/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.hash
similarity index 100%
rename from software/package/x11r7/xutil_makedepend/xutil_makedepend.hash
rename to buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.hash
diff --git a/software/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.mk
similarity index 100%
rename from software/package/x11r7/xutil_makedepend/xutil_makedepend.mk
rename to buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.mk
diff --git a/software/package/x11vnc/Config.in b/buildroot/package/x11vnc/Config.in
similarity index 100%
rename from software/package/x11vnc/Config.in
rename to buildroot/package/x11vnc/Config.in
diff --git a/software/package/x11vnc/x11vnc.hash b/buildroot/package/x11vnc/x11vnc.hash
similarity index 100%
rename from software/package/x11vnc/x11vnc.hash
rename to buildroot/package/x11vnc/x11vnc.hash
diff --git a/software/package/x11vnc/x11vnc.mk b/buildroot/package/x11vnc/x11vnc.mk
similarity index 100%
rename from software/package/x11vnc/x11vnc.mk
rename to buildroot/package/x11vnc/x11vnc.mk
diff --git a/software/package/x264/Config.in b/buildroot/package/x264/Config.in
similarity index 100%
rename from software/package/x264/Config.in
rename to buildroot/package/x264/Config.in
diff --git a/software/package/x264/x264.hash b/buildroot/package/x264/x264.hash
similarity index 100%
rename from software/package/x264/x264.hash
rename to buildroot/package/x264/x264.hash
diff --git a/software/package/x264/x264.mk b/buildroot/package/x264/x264.mk
similarity index 100%
rename from software/package/x264/x264.mk
rename to buildroot/package/x264/x264.mk
diff --git a/software/package/x265/0001-fix-gcc-options.patch b/buildroot/package/x265/0001-fix-gcc-options.patch
similarity index 100%
rename from software/package/x265/0001-fix-gcc-options.patch
rename to buildroot/package/x265/0001-fix-gcc-options.patch
diff --git a/software/package/x265/0002-arm-asm-primitives.patch b/buildroot/package/x265/0002-arm-asm-primitives.patch
similarity index 100%
rename from software/package/x265/0002-arm-asm-primitives.patch
rename to buildroot/package/x265/0002-arm-asm-primitives.patch
diff --git a/software/package/x265/Config.in b/buildroot/package/x265/Config.in
similarity index 100%
rename from software/package/x265/Config.in
rename to buildroot/package/x265/Config.in
diff --git a/software/package/x265/x265.hash b/buildroot/package/x265/x265.hash
similarity index 100%
rename from software/package/x265/x265.hash
rename to buildroot/package/x265/x265.hash
diff --git a/software/package/x265/x265.mk b/buildroot/package/x265/x265.mk
similarity index 100%
rename from software/package/x265/x265.mk
rename to buildroot/package/x265/x265.mk
diff --git a/software/package/xapian/Config.in b/buildroot/package/xapian/Config.in
similarity index 100%
rename from software/package/xapian/Config.in
rename to buildroot/package/xapian/Config.in
diff --git a/software/package/xapian/xapian.hash b/buildroot/package/xapian/xapian.hash
similarity index 100%
rename from software/package/xapian/xapian.hash
rename to buildroot/package/xapian/xapian.hash
diff --git a/software/package/xapian/xapian.mk b/buildroot/package/xapian/xapian.mk
similarity index 100%
rename from software/package/xapian/xapian.mk
rename to buildroot/package/xapian/xapian.mk
diff --git a/software/package/xavante/Config.in b/buildroot/package/xavante/Config.in
similarity index 100%
rename from software/package/xavante/Config.in
rename to buildroot/package/xavante/Config.in
diff --git a/software/package/xavante/xavante.hash b/buildroot/package/xavante/xavante.hash
similarity index 100%
rename from software/package/xavante/xavante.hash
rename to buildroot/package/xavante/xavante.hash
diff --git a/software/package/xavante/xavante.mk b/buildroot/package/xavante/xavante.mk
similarity index 100%
rename from software/package/xavante/xavante.mk
rename to buildroot/package/xavante/xavante.mk
diff --git a/software/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch b/buildroot/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch
similarity index 100%
rename from software/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch
rename to buildroot/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch
diff --git a/software/package/xdg-dbus-proxy/Config.in b/buildroot/package/xdg-dbus-proxy/Config.in
similarity index 100%
rename from software/package/xdg-dbus-proxy/Config.in
rename to buildroot/package/xdg-dbus-proxy/Config.in
diff --git a/software/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.hash
similarity index 100%
rename from software/package/xdg-dbus-proxy/xdg-dbus-proxy.hash
rename to buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.hash
diff --git a/software/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.mk
similarity index 100%
rename from software/package/xdg-dbus-proxy/xdg-dbus-proxy.mk
rename to buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.mk
diff --git a/software/package/xdotool/Config.in b/buildroot/package/xdotool/Config.in
similarity index 100%
rename from software/package/xdotool/Config.in
rename to buildroot/package/xdotool/Config.in
diff --git a/software/package/xdotool/xdotool.hash b/buildroot/package/xdotool/xdotool.hash
similarity index 100%
rename from software/package/xdotool/xdotool.hash
rename to buildroot/package/xdotool/xdotool.hash
diff --git a/software/package/xdotool/xdotool.mk b/buildroot/package/xdotool/xdotool.mk
similarity index 100%
rename from software/package/xdotool/xdotool.mk
rename to buildroot/package/xdotool/xdotool.mk
diff --git a/software/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
similarity index 100%
rename from software/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
rename to buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
diff --git a/software/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch b/buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
similarity index 100%
rename from software/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
rename to buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
diff --git a/software/package/xen/Config.in b/buildroot/package/xen/Config.in
similarity index 100%
rename from software/package/xen/Config.in
rename to buildroot/package/xen/Config.in
diff --git a/software/package/xen/xen.hash b/buildroot/package/xen/xen.hash
similarity index 100%
rename from software/package/xen/xen.hash
rename to buildroot/package/xen/xen.hash
diff --git a/software/package/xen/xen.mk b/buildroot/package/xen/xen.mk
similarity index 100%
rename from software/package/xen/xen.mk
rename to buildroot/package/xen/xen.mk
diff --git a/software/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in
similarity index 100%
rename from software/package/xenomai/Config.in
rename to buildroot/package/xenomai/Config.in
diff --git a/software/package/xenomai/xenomai.hash b/buildroot/package/xenomai/xenomai.hash
similarity index 100%
rename from software/package/xenomai/xenomai.hash
rename to buildroot/package/xenomai/xenomai.hash
diff --git a/software/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk
similarity index 100%
rename from software/package/xenomai/xenomai.mk
rename to buildroot/package/xenomai/xenomai.mk
diff --git a/software/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch b/buildroot/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch
similarity index 100%
rename from software/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch
rename to buildroot/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch
diff --git a/software/package/xerces/0002-fix-static-linking-with-curl.patch b/buildroot/package/xerces/0002-fix-static-linking-with-curl.patch
similarity index 100%
rename from software/package/xerces/0002-fix-static-linking-with-curl.patch
rename to buildroot/package/xerces/0002-fix-static-linking-with-curl.patch
diff --git a/software/package/xerces/Config.in b/buildroot/package/xerces/Config.in
similarity index 100%
rename from software/package/xerces/Config.in
rename to buildroot/package/xerces/Config.in
diff --git a/software/package/xerces/xerces.hash b/buildroot/package/xerces/xerces.hash
similarity index 100%
rename from software/package/xerces/xerces.hash
rename to buildroot/package/xerces/xerces.hash
diff --git a/software/package/xerces/xerces.mk b/buildroot/package/xerces/xerces.mk
similarity index 100%
rename from software/package/xerces/xerces.mk
rename to buildroot/package/xerces/xerces.mk
diff --git a/software/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
similarity index 100%
rename from software/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
rename to buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
diff --git a/software/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/buildroot/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch
similarity index 100%
rename from software/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch
rename to buildroot/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch
diff --git a/software/package/xfsprogs/Config.in b/buildroot/package/xfsprogs/Config.in
similarity index 100%
rename from software/package/xfsprogs/Config.in
rename to buildroot/package/xfsprogs/Config.in
diff --git a/software/package/xfsprogs/xfsprogs.hash b/buildroot/package/xfsprogs/xfsprogs.hash
similarity index 100%
rename from software/package/xfsprogs/xfsprogs.hash
rename to buildroot/package/xfsprogs/xfsprogs.hash
diff --git a/software/package/xfsprogs/xfsprogs.mk b/buildroot/package/xfsprogs/xfsprogs.mk
similarity index 100%
rename from software/package/xfsprogs/xfsprogs.mk
rename to buildroot/package/xfsprogs/xfsprogs.mk
diff --git a/software/package/xinetd/0001-ar.patch b/buildroot/package/xinetd/0001-ar.patch
similarity index 100%
rename from software/package/xinetd/0001-ar.patch
rename to buildroot/package/xinetd/0001-ar.patch
diff --git a/software/package/xinetd/0002-destdir.patch b/buildroot/package/xinetd/0002-destdir.patch
similarity index 100%
rename from software/package/xinetd/0002-destdir.patch
rename to buildroot/package/xinetd/0002-destdir.patch
diff --git a/software/package/xinetd/0003-rpc-fix.patch b/buildroot/package/xinetd/0003-rpc-fix.patch
similarity index 100%
rename from software/package/xinetd/0003-rpc-fix.patch
rename to buildroot/package/xinetd/0003-rpc-fix.patch
diff --git a/software/package/xinetd/0004-configure-rlim_t.patch b/buildroot/package/xinetd/0004-configure-rlim_t.patch
similarity index 100%
rename from software/package/xinetd/0004-configure-rlim_t.patch
rename to buildroot/package/xinetd/0004-configure-rlim_t.patch
diff --git a/software/package/xinetd/Config.in b/buildroot/package/xinetd/Config.in
similarity index 100%
rename from software/package/xinetd/Config.in
rename to buildroot/package/xinetd/Config.in
diff --git a/software/package/xinetd/xinetd.hash b/buildroot/package/xinetd/xinetd.hash
similarity index 100%
rename from software/package/xinetd/xinetd.hash
rename to buildroot/package/xinetd/xinetd.hash
diff --git a/software/package/xinetd/xinetd.mk b/buildroot/package/xinetd/xinetd.mk
similarity index 100%
rename from software/package/xinetd/xinetd.mk
rename to buildroot/package/xinetd/xinetd.mk
diff --git a/software/package/xl2tp/Config.in b/buildroot/package/xl2tp/Config.in
similarity index 100%
rename from software/package/xl2tp/Config.in
rename to buildroot/package/xl2tp/Config.in
diff --git a/software/package/xl2tp/xl2tp.hash b/buildroot/package/xl2tp/xl2tp.hash
similarity index 100%
rename from software/package/xl2tp/xl2tp.hash
rename to buildroot/package/xl2tp/xl2tp.hash
diff --git a/software/package/xl2tp/xl2tp.mk b/buildroot/package/xl2tp/xl2tp.mk
similarity index 100%
rename from software/package/xl2tp/xl2tp.mk
rename to buildroot/package/xl2tp/xl2tp.mk
diff --git a/software/package/xl2tp/xl2tpd b/buildroot/package/xl2tp/xl2tpd
similarity index 100%
rename from software/package/xl2tp/xl2tpd
rename to buildroot/package/xl2tp/xl2tpd
diff --git a/software/package/xmlstarlet/Config.in b/buildroot/package/xmlstarlet/Config.in
similarity index 100%
rename from software/package/xmlstarlet/Config.in
rename to buildroot/package/xmlstarlet/Config.in
diff --git a/software/package/xmlstarlet/xmlstarlet.hash b/buildroot/package/xmlstarlet/xmlstarlet.hash
similarity index 100%
rename from software/package/xmlstarlet/xmlstarlet.hash
rename to buildroot/package/xmlstarlet/xmlstarlet.hash
diff --git a/software/package/xmlstarlet/xmlstarlet.mk b/buildroot/package/xmlstarlet/xmlstarlet.mk
similarity index 100%
rename from software/package/xmlstarlet/xmlstarlet.mk
rename to buildroot/package/xmlstarlet/xmlstarlet.mk
diff --git a/software/package/xorriso/Config.in b/buildroot/package/xorriso/Config.in
similarity index 100%
rename from software/package/xorriso/Config.in
rename to buildroot/package/xorriso/Config.in
diff --git a/software/package/xorriso/Config.in.host b/buildroot/package/xorriso/Config.in.host
similarity index 100%
rename from software/package/xorriso/Config.in.host
rename to buildroot/package/xorriso/Config.in.host
diff --git a/software/package/xorriso/xorriso.hash b/buildroot/package/xorriso/xorriso.hash
similarity index 100%
rename from software/package/xorriso/xorriso.hash
rename to buildroot/package/xorriso/xorriso.hash
diff --git a/software/package/xorriso/xorriso.mk b/buildroot/package/xorriso/xorriso.mk
similarity index 100%
rename from software/package/xorriso/xorriso.mk
rename to buildroot/package/xorriso/xorriso.mk
diff --git a/software/package/xr819-xradio/Config.in b/buildroot/package/xr819-xradio/Config.in
similarity index 100%
rename from software/package/xr819-xradio/Config.in
rename to buildroot/package/xr819-xradio/Config.in
diff --git a/software/package/xr819-xradio/xr819-xradio.hash b/buildroot/package/xr819-xradio/xr819-xradio.hash
similarity index 100%
rename from software/package/xr819-xradio/xr819-xradio.hash
rename to buildroot/package/xr819-xradio/xr819-xradio.hash
diff --git a/software/package/xr819-xradio/xr819-xradio.mk b/buildroot/package/xr819-xradio/xr819-xradio.mk
similarity index 100%
rename from software/package/xr819-xradio/xr819-xradio.mk
rename to buildroot/package/xr819-xradio/xr819-xradio.mk
diff --git a/software/package/xscreensaver/Config.in b/buildroot/package/xscreensaver/Config.in
similarity index 100%
rename from software/package/xscreensaver/Config.in
rename to buildroot/package/xscreensaver/Config.in
diff --git a/software/package/xscreensaver/xscreensaver.hash b/buildroot/package/xscreensaver/xscreensaver.hash
similarity index 100%
rename from software/package/xscreensaver/xscreensaver.hash
rename to buildroot/package/xscreensaver/xscreensaver.hash
diff --git a/software/package/xscreensaver/xscreensaver.mk b/buildroot/package/xscreensaver/xscreensaver.mk
similarity index 100%
rename from software/package/xscreensaver/xscreensaver.mk
rename to buildroot/package/xscreensaver/xscreensaver.mk
diff --git a/software/package/xtables-addons/Config.in b/buildroot/package/xtables-addons/Config.in
similarity index 100%
rename from software/package/xtables-addons/Config.in
rename to buildroot/package/xtables-addons/Config.in
diff --git a/software/package/xtables-addons/xtables-addons.hash b/buildroot/package/xtables-addons/xtables-addons.hash
similarity index 100%
rename from software/package/xtables-addons/xtables-addons.hash
rename to buildroot/package/xtables-addons/xtables-addons.hash
diff --git a/software/package/xtables-addons/xtables-addons.mk b/buildroot/package/xtables-addons/xtables-addons.mk
similarity index 100%
rename from software/package/xtables-addons/xtables-addons.mk
rename to buildroot/package/xtables-addons/xtables-addons.mk
diff --git a/software/package/xterm/Config.in b/buildroot/package/xterm/Config.in
similarity index 100%
rename from software/package/xterm/Config.in
rename to buildroot/package/xterm/Config.in
diff --git a/software/package/xterm/xterm.hash b/buildroot/package/xterm/xterm.hash
similarity index 100%
rename from software/package/xterm/xterm.hash
rename to buildroot/package/xterm/xterm.hash
diff --git a/software/package/xterm/xterm.mk b/buildroot/package/xterm/xterm.mk
similarity index 100%
rename from software/package/xterm/xterm.mk
rename to buildroot/package/xterm/xterm.mk
diff --git a/software/package/xutil_util-macros/Config.in b/buildroot/package/xutil_util-macros/Config.in
similarity index 100%
rename from software/package/xutil_util-macros/Config.in
rename to buildroot/package/xutil_util-macros/Config.in
diff --git a/software/package/xutil_util-macros/xutil_util-macros.hash b/buildroot/package/xutil_util-macros/xutil_util-macros.hash
similarity index 100%
rename from software/package/xutil_util-macros/xutil_util-macros.hash
rename to buildroot/package/xutil_util-macros/xutil_util-macros.hash
diff --git a/software/package/xutil_util-macros/xutil_util-macros.mk b/buildroot/package/xutil_util-macros/xutil_util-macros.mk
similarity index 100%
rename from software/package/xutil_util-macros/xutil_util-macros.mk
rename to buildroot/package/xutil_util-macros/xutil_util-macros.mk
diff --git a/software/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch b/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch
similarity index 100%
rename from software/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch
rename to buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch
diff --git a/software/package/xvisor/Config.in b/buildroot/package/xvisor/Config.in
similarity index 100%
rename from software/package/xvisor/Config.in
rename to buildroot/package/xvisor/Config.in
diff --git a/software/package/xvisor/xvisor.hash b/buildroot/package/xvisor/xvisor.hash
similarity index 100%
rename from software/package/xvisor/xvisor.hash
rename to buildroot/package/xvisor/xvisor.hash
diff --git a/software/package/xvisor/xvisor.mk b/buildroot/package/xvisor/xvisor.mk
similarity index 100%
rename from software/package/xvisor/xvisor.mk
rename to buildroot/package/xvisor/xvisor.mk
diff --git a/software/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch b/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch
similarity index 100%
rename from software/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch
rename to buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch
diff --git a/software/package/xvkbd/Config.in b/buildroot/package/xvkbd/Config.in
similarity index 100%
rename from software/package/xvkbd/Config.in
rename to buildroot/package/xvkbd/Config.in
diff --git a/software/package/xvkbd/xvkbd.hash b/buildroot/package/xvkbd/xvkbd.hash
similarity index 100%
rename from software/package/xvkbd/xvkbd.hash
rename to buildroot/package/xvkbd/xvkbd.hash
diff --git a/software/package/xvkbd/xvkbd.mk b/buildroot/package/xvkbd/xvkbd.mk
similarity index 100%
rename from software/package/xvkbd/xvkbd.mk
rename to buildroot/package/xvkbd/xvkbd.mk
diff --git a/software/package/xxhash/Config.in b/buildroot/package/xxhash/Config.in
similarity index 100%
rename from software/package/xxhash/Config.in
rename to buildroot/package/xxhash/Config.in
diff --git a/software/package/xxhash/xxhash.hash b/buildroot/package/xxhash/xxhash.hash
similarity index 100%
rename from software/package/xxhash/xxhash.hash
rename to buildroot/package/xxhash/xxhash.hash
diff --git a/software/package/xxhash/xxhash.mk b/buildroot/package/xxhash/xxhash.mk
similarity index 100%
rename from software/package/xxhash/xxhash.mk
rename to buildroot/package/xxhash/xxhash.mk
diff --git a/software/package/xz/Config.in b/buildroot/package/xz/Config.in
similarity index 100%
rename from software/package/xz/Config.in
rename to buildroot/package/xz/Config.in
diff --git a/software/package/xz/xz.hash b/buildroot/package/xz/xz.hash
similarity index 100%
rename from software/package/xz/xz.hash
rename to buildroot/package/xz/xz.hash
diff --git a/software/package/xz/xz.mk b/buildroot/package/xz/xz.mk
similarity index 100%
rename from software/package/xz/xz.mk
rename to buildroot/package/xz/xz.mk
diff --git a/software/package/yad/Config.in b/buildroot/package/yad/Config.in
similarity index 100%
rename from software/package/yad/Config.in
rename to buildroot/package/yad/Config.in
diff --git a/software/package/yad/yad.hash b/buildroot/package/yad/yad.hash
similarity index 100%
rename from software/package/yad/yad.hash
rename to buildroot/package/yad/yad.hash
diff --git a/software/package/yad/yad.mk b/buildroot/package/yad/yad.mk
similarity index 100%
rename from software/package/yad/yad.mk
rename to buildroot/package/yad/yad.mk
diff --git a/software/package/yaffs2utils/yaffs2utils.hash b/buildroot/package/yaffs2utils/yaffs2utils.hash
similarity index 100%
rename from software/package/yaffs2utils/yaffs2utils.hash
rename to buildroot/package/yaffs2utils/yaffs2utils.hash
diff --git a/software/package/yaffs2utils/yaffs2utils.mk b/buildroot/package/yaffs2utils/yaffs2utils.mk
similarity index 100%
rename from software/package/yaffs2utils/yaffs2utils.mk
rename to buildroot/package/yaffs2utils/yaffs2utils.mk
diff --git a/software/package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch b/buildroot/package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch
similarity index 100%
rename from software/package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch
rename to buildroot/package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch
diff --git a/software/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/buildroot/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch
similarity index 100%
rename from software/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch
rename to buildroot/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch
diff --git a/software/package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch b/buildroot/package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch
similarity index 100%
rename from software/package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch
rename to buildroot/package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch
diff --git a/software/package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch b/buildroot/package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch
similarity index 100%
rename from software/package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch
rename to buildroot/package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch
diff --git a/software/package/yajl/Config.in b/buildroot/package/yajl/Config.in
similarity index 100%
rename from software/package/yajl/Config.in
rename to buildroot/package/yajl/Config.in
diff --git a/software/package/yajl/yajl.hash b/buildroot/package/yajl/yajl.hash
similarity index 100%
rename from software/package/yajl/yajl.hash
rename to buildroot/package/yajl/yajl.hash
diff --git a/software/package/yajl/yajl.mk b/buildroot/package/yajl/yajl.mk
similarity index 100%
rename from software/package/yajl/yajl.mk
rename to buildroot/package/yajl/yajl.mk
diff --git a/software/package/yaml-cpp/Config.in b/buildroot/package/yaml-cpp/Config.in
similarity index 100%
rename from software/package/yaml-cpp/Config.in
rename to buildroot/package/yaml-cpp/Config.in
diff --git a/software/package/yaml-cpp/yaml-cpp.hash b/buildroot/package/yaml-cpp/yaml-cpp.hash
similarity index 100%
rename from software/package/yaml-cpp/yaml-cpp.hash
rename to buildroot/package/yaml-cpp/yaml-cpp.hash
diff --git a/software/package/yaml-cpp/yaml-cpp.mk b/buildroot/package/yaml-cpp/yaml-cpp.mk
similarity index 100%
rename from software/package/yaml-cpp/yaml-cpp.mk
rename to buildroot/package/yaml-cpp/yaml-cpp.mk
diff --git a/software/package/yasm/Config.in b/buildroot/package/yasm/Config.in
similarity index 100%
rename from software/package/yasm/Config.in
rename to buildroot/package/yasm/Config.in
diff --git a/software/package/yasm/yasm.hash b/buildroot/package/yasm/yasm.hash
similarity index 100%
rename from software/package/yasm/yasm.hash
rename to buildroot/package/yasm/yasm.hash
diff --git a/software/package/yasm/yasm.mk b/buildroot/package/yasm/yasm.mk
similarity index 100%
rename from software/package/yasm/yasm.mk
rename to buildroot/package/yasm/yasm.mk
diff --git a/software/package/yavta/Config.in b/buildroot/package/yavta/Config.in
similarity index 100%
rename from software/package/yavta/Config.in
rename to buildroot/package/yavta/Config.in
diff --git a/software/package/yavta/yavta.mk b/buildroot/package/yavta/yavta.mk
similarity index 100%
rename from software/package/yavta/yavta.mk
rename to buildroot/package/yavta/yavta.mk
diff --git a/software/package/ympd/0001-only-c-language.patch b/buildroot/package/ympd/0001-only-c-language.patch
similarity index 100%
rename from software/package/ympd/0001-only-c-language.patch
rename to buildroot/package/ympd/0001-only-c-language.patch
diff --git a/software/package/ympd/Config.in b/buildroot/package/ympd/Config.in
similarity index 100%
rename from software/package/ympd/Config.in
rename to buildroot/package/ympd/Config.in
diff --git a/software/package/ympd/ympd.hash b/buildroot/package/ympd/ympd.hash
similarity index 100%
rename from software/package/ympd/ympd.hash
rename to buildroot/package/ympd/ympd.hash
diff --git a/software/package/ympd/ympd.mk b/buildroot/package/ympd/ympd.mk
similarity index 100%
rename from software/package/ympd/ympd.mk
rename to buildroot/package/ympd/ympd.mk
diff --git a/software/package/ytree/0001-fix-musl.patch b/buildroot/package/ytree/0001-fix-musl.patch
similarity index 100%
rename from software/package/ytree/0001-fix-musl.patch
rename to buildroot/package/ytree/0001-fix-musl.patch
diff --git a/software/package/ytree/Config.in b/buildroot/package/ytree/Config.in
similarity index 100%
rename from software/package/ytree/Config.in
rename to buildroot/package/ytree/Config.in
diff --git a/software/package/ytree/ytree.hash b/buildroot/package/ytree/ytree.hash
similarity index 100%
rename from software/package/ytree/ytree.hash
rename to buildroot/package/ytree/ytree.hash
diff --git a/software/package/ytree/ytree.mk b/buildroot/package/ytree/ytree.mk
similarity index 100%
rename from software/package/ytree/ytree.mk
rename to buildroot/package/ytree/ytree.mk
diff --git a/software/package/zbar/Config.in b/buildroot/package/zbar/Config.in
similarity index 100%
rename from software/package/zbar/Config.in
rename to buildroot/package/zbar/Config.in
diff --git a/software/package/zbar/zbar.hash b/buildroot/package/zbar/zbar.hash
similarity index 100%
rename from software/package/zbar/zbar.hash
rename to buildroot/package/zbar/zbar.hash
diff --git a/software/package/zbar/zbar.mk b/buildroot/package/zbar/zbar.mk
similarity index 100%
rename from software/package/zbar/zbar.mk
rename to buildroot/package/zbar/zbar.mk
diff --git a/software/package/zd1211-firmware/Config.in b/buildroot/package/zd1211-firmware/Config.in
similarity index 100%
rename from software/package/zd1211-firmware/Config.in
rename to buildroot/package/zd1211-firmware/Config.in
diff --git a/software/package/zd1211-firmware/zd1211-firmware.hash b/buildroot/package/zd1211-firmware/zd1211-firmware.hash
similarity index 100%
rename from software/package/zd1211-firmware/zd1211-firmware.hash
rename to buildroot/package/zd1211-firmware/zd1211-firmware.hash
diff --git a/software/package/zd1211-firmware/zd1211-firmware.mk b/buildroot/package/zd1211-firmware/zd1211-firmware.mk
similarity index 100%
rename from software/package/zd1211-firmware/zd1211-firmware.mk
rename to buildroot/package/zd1211-firmware/zd1211-firmware.mk
diff --git a/software/package/zeromq/Config.in b/buildroot/package/zeromq/Config.in
similarity index 100%
rename from software/package/zeromq/Config.in
rename to buildroot/package/zeromq/Config.in
diff --git a/software/package/zeromq/zeromq.hash b/buildroot/package/zeromq/zeromq.hash
similarity index 100%
rename from software/package/zeromq/zeromq.hash
rename to buildroot/package/zeromq/zeromq.hash
diff --git a/software/package/zeromq/zeromq.mk b/buildroot/package/zeromq/zeromq.mk
similarity index 100%
rename from software/package/zeromq/zeromq.mk
rename to buildroot/package/zeromq/zeromq.mk
diff --git a/software/package/zic/0001-remove-dependency-check-on-version-file.patch b/buildroot/package/zic/0001-remove-dependency-check-on-version-file.patch
similarity index 100%
rename from software/package/zic/0001-remove-dependency-check-on-version-file.patch
rename to buildroot/package/zic/0001-remove-dependency-check-on-version-file.patch
diff --git a/software/package/zic/zic.hash b/buildroot/package/zic/zic.hash
similarity index 100%
rename from software/package/zic/zic.hash
rename to buildroot/package/zic/zic.hash
diff --git a/software/package/zic/zic.mk b/buildroot/package/zic/zic.mk
similarity index 100%
rename from software/package/zic/zic.mk
rename to buildroot/package/zic/zic.mk
diff --git a/software/package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch b/buildroot/package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
similarity index 100%
rename from software/package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
rename to buildroot/package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
diff --git a/software/package/zip/0002-configure-Don-t-use-host-CPP.patch b/buildroot/package/zip/0002-configure-Don-t-use-host-CPP.patch
similarity index 100%
rename from software/package/zip/0002-configure-Don-t-use-host-CPP.patch
rename to buildroot/package/zip/0002-configure-Don-t-use-host-CPP.patch
diff --git a/software/package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch b/buildroot/package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
similarity index 100%
rename from software/package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
rename to buildroot/package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
diff --git a/software/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch b/buildroot/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
similarity index 100%
rename from software/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
rename to buildroot/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
diff --git a/software/package/zip/0005-unix-configure-remove-GID-UID-size-check.patch b/buildroot/package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
similarity index 100%
rename from software/package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
rename to buildroot/package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
diff --git a/software/package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch b/buildroot/package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
similarity index 100%
rename from software/package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
rename to buildroot/package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
diff --git a/software/package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch b/buildroot/package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch
similarity index 100%
rename from software/package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch
rename to buildroot/package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch
diff --git a/software/package/zip/Config.in b/buildroot/package/zip/Config.in
similarity index 100%
rename from software/package/zip/Config.in
rename to buildroot/package/zip/Config.in
diff --git a/software/package/zip/Config.in.host b/buildroot/package/zip/Config.in.host
similarity index 100%
rename from software/package/zip/Config.in.host
rename to buildroot/package/zip/Config.in.host
diff --git a/software/package/zip/zip.hash b/buildroot/package/zip/zip.hash
similarity index 100%
rename from software/package/zip/zip.hash
rename to buildroot/package/zip/zip.hash
diff --git a/software/package/zip/zip.mk b/buildroot/package/zip/zip.mk
similarity index 100%
rename from software/package/zip/zip.mk
rename to buildroot/package/zip/zip.mk
diff --git a/software/package/zisofs-tools/zisofs-tools.hash b/buildroot/package/zisofs-tools/zisofs-tools.hash
similarity index 100%
rename from software/package/zisofs-tools/zisofs-tools.hash
rename to buildroot/package/zisofs-tools/zisofs-tools.hash
diff --git a/software/package/zisofs-tools/zisofs-tools.mk b/buildroot/package/zisofs-tools/zisofs-tools.mk
similarity index 100%
rename from software/package/zisofs-tools/zisofs-tools.mk
rename to buildroot/package/zisofs-tools/zisofs-tools.mk
diff --git a/software/package/zlib-ng/zlib-ng.hash b/buildroot/package/zlib-ng/zlib-ng.hash
similarity index 100%
rename from software/package/zlib-ng/zlib-ng.hash
rename to buildroot/package/zlib-ng/zlib-ng.hash
diff --git a/software/package/zlib-ng/zlib-ng.mk b/buildroot/package/zlib-ng/zlib-ng.mk
similarity index 100%
rename from software/package/zlib-ng/zlib-ng.mk
rename to buildroot/package/zlib-ng/zlib-ng.mk
diff --git a/software/package/zlib/Config.in b/buildroot/package/zlib/Config.in
similarity index 100%
rename from software/package/zlib/Config.in
rename to buildroot/package/zlib/Config.in
diff --git a/software/package/zlib/zlib.mk b/buildroot/package/zlib/zlib.mk
similarity index 100%
rename from software/package/zlib/zlib.mk
rename to buildroot/package/zlib/zlib.mk
diff --git a/software/package/zlog/Config.in b/buildroot/package/zlog/Config.in
similarity index 100%
rename from software/package/zlog/Config.in
rename to buildroot/package/zlog/Config.in
diff --git a/software/package/zlog/zlog.hash b/buildroot/package/zlog/zlog.hash
similarity index 100%
rename from software/package/zlog/zlog.hash
rename to buildroot/package/zlog/zlog.hash
diff --git a/software/package/zlog/zlog.mk b/buildroot/package/zlog/zlog.mk
similarity index 100%
rename from software/package/zlog/zlog.mk
rename to buildroot/package/zlog/zlog.mk
diff --git a/software/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch b/buildroot/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch
similarity index 100%
rename from software/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch
rename to buildroot/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch
diff --git a/software/package/zmqpp/Config.in b/buildroot/package/zmqpp/Config.in
similarity index 100%
rename from software/package/zmqpp/Config.in
rename to buildroot/package/zmqpp/Config.in
diff --git a/software/package/zmqpp/zmqpp.hash b/buildroot/package/zmqpp/zmqpp.hash
similarity index 100%
rename from software/package/zmqpp/zmqpp.hash
rename to buildroot/package/zmqpp/zmqpp.hash
diff --git a/software/package/zmqpp/zmqpp.mk b/buildroot/package/zmqpp/zmqpp.mk
similarity index 100%
rename from software/package/zmqpp/zmqpp.mk
rename to buildroot/package/zmqpp/zmqpp.mk
diff --git a/software/package/znc/Config.in b/buildroot/package/znc/Config.in
similarity index 100%
rename from software/package/znc/Config.in
rename to buildroot/package/znc/Config.in
diff --git a/software/package/znc/znc.hash b/buildroot/package/znc/znc.hash
similarity index 100%
rename from software/package/znc/znc.hash
rename to buildroot/package/znc/znc.hash
diff --git a/software/package/znc/znc.mk b/buildroot/package/znc/znc.mk
similarity index 100%
rename from software/package/znc/znc.mk
rename to buildroot/package/znc/znc.mk
diff --git a/software/package/zsh/Config.in b/buildroot/package/zsh/Config.in
similarity index 100%
rename from software/package/zsh/Config.in
rename to buildroot/package/zsh/Config.in
diff --git a/software/package/zsh/zsh.hash b/buildroot/package/zsh/zsh.hash
similarity index 100%
rename from software/package/zsh/zsh.hash
rename to buildroot/package/zsh/zsh.hash
diff --git a/software/package/zsh/zsh.mk b/buildroot/package/zsh/zsh.mk
similarity index 100%
rename from software/package/zsh/zsh.mk
rename to buildroot/package/zsh/zsh.mk
diff --git a/software/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch b/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch
similarity index 100%
rename from software/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch
rename to buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch
diff --git a/software/package/zstd/Config.in b/buildroot/package/zstd/Config.in
similarity index 100%
rename from software/package/zstd/Config.in
rename to buildroot/package/zstd/Config.in
diff --git a/software/package/zstd/Config.in.host b/buildroot/package/zstd/Config.in.host
similarity index 100%
rename from software/package/zstd/Config.in.host
rename to buildroot/package/zstd/Config.in.host
diff --git a/software/package/zstd/zstd.hash b/buildroot/package/zstd/zstd.hash
similarity index 100%
rename from software/package/zstd/zstd.hash
rename to buildroot/package/zstd/zstd.hash
diff --git a/software/package/zstd/zstd.mk b/buildroot/package/zstd/zstd.mk
similarity index 100%
rename from software/package/zstd/zstd.mk
rename to buildroot/package/zstd/zstd.mk
diff --git a/software/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/buildroot/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch
similarity index 100%
rename from software/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch
rename to buildroot/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch
diff --git a/software/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/buildroot/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch
similarity index 100%
rename from software/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch
rename to buildroot/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch
diff --git a/software/package/zxing-cpp/Config.in b/buildroot/package/zxing-cpp/Config.in
similarity index 100%
rename from software/package/zxing-cpp/Config.in
rename to buildroot/package/zxing-cpp/Config.in
diff --git a/software/package/zxing-cpp/zxing-cpp.hash b/buildroot/package/zxing-cpp/zxing-cpp.hash
similarity index 100%
rename from software/package/zxing-cpp/zxing-cpp.hash
rename to buildroot/package/zxing-cpp/zxing-cpp.hash
diff --git a/software/package/zxing-cpp/zxing-cpp.mk b/buildroot/package/zxing-cpp/zxing-cpp.mk
similarity index 100%
rename from software/package/zxing-cpp/zxing-cpp.mk
rename to buildroot/package/zxing-cpp/zxing-cpp.mk
diff --git a/software/package/zynq-boot-bin/zynq-boot-bin.hash b/buildroot/package/zynq-boot-bin/zynq-boot-bin.hash
similarity index 100%
rename from software/package/zynq-boot-bin/zynq-boot-bin.hash
rename to buildroot/package/zynq-boot-bin/zynq-boot-bin.hash
diff --git a/software/package/zynq-boot-bin/zynq-boot-bin.mk b/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk
similarity index 100%
rename from software/package/zynq-boot-bin/zynq-boot-bin.mk
rename to buildroot/package/zynq-boot-bin/zynq-boot-bin.mk
diff --git a/software/package/zyre/Config.in b/buildroot/package/zyre/Config.in
similarity index 100%
rename from software/package/zyre/Config.in
rename to buildroot/package/zyre/Config.in
diff --git a/software/package/zyre/zyre.hash b/buildroot/package/zyre/zyre.hash
similarity index 100%
rename from software/package/zyre/zyre.hash
rename to buildroot/package/zyre/zyre.hash
diff --git a/software/package/zyre/zyre.mk b/buildroot/package/zyre/zyre.mk
similarity index 100%
rename from software/package/zyre/zyre.mk
rename to buildroot/package/zyre/zyre.mk
diff --git a/software/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch b/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch
similarity index 100%
rename from software/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch
rename to buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch
diff --git a/software/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch b/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch
similarity index 100%
rename from software/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch
rename to buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch
diff --git a/software/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch b/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch
similarity index 100%
rename from software/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch
rename to buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch
diff --git a/software/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch b/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch
similarity index 100%
rename from software/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch
rename to buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch
diff --git a/software/package/zziplib/Config.in b/buildroot/package/zziplib/Config.in
similarity index 100%
rename from software/package/zziplib/Config.in
rename to buildroot/package/zziplib/Config.in
diff --git a/software/package/zziplib/zziplib.hash b/buildroot/package/zziplib/zziplib.hash
similarity index 100%
rename from software/package/zziplib/zziplib.hash
rename to buildroot/package/zziplib/zziplib.hash
diff --git a/software/package/zziplib/zziplib.mk b/buildroot/package/zziplib/zziplib.mk
similarity index 100%
rename from software/package/zziplib/zziplib.mk
rename to buildroot/package/zziplib/zziplib.mk
diff --git a/software/rebuild-kernel.sh b/buildroot/rebuild-kernel.sh
similarity index 100%
rename from software/rebuild-kernel.sh
rename to buildroot/rebuild-kernel.sh
diff --git a/software/rebuild-uboot.sh b/buildroot/rebuild-uboot.sh
similarity index 100%
rename from software/rebuild-uboot.sh
rename to buildroot/rebuild-uboot.sh
diff --git a/software/support/config-fragments/autobuild/andes-nds32.config b/buildroot/support/config-fragments/autobuild/andes-nds32.config
similarity index 100%
rename from software/support/config-fragments/autobuild/andes-nds32.config
rename to buildroot/support/config-fragments/autobuild/andes-nds32.config
diff --git a/software/support/config-fragments/autobuild/arm-aarch64.config b/buildroot/support/config-fragments/autobuild/arm-aarch64.config
similarity index 100%
rename from software/support/config-fragments/autobuild/arm-aarch64.config
rename to buildroot/support/config-fragments/autobuild/arm-aarch64.config
diff --git a/software/support/config-fragments/autobuild/br-aarch64-glibc.config b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-aarch64-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-arc-full-internal.config b/buildroot/support/config-fragments/autobuild/br-arc-full-internal.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arc-full-internal.config
rename to buildroot/support/config-fragments/autobuild/br-arc-full-internal.config
diff --git a/software/support/config-fragments/autobuild/br-arc-internal-glibc.config b/buildroot/support/config-fragments/autobuild/br-arc-internal-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arc-internal-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-arc-internal-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-arcle-hs38.config b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arcle-hs38.config
rename to buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
diff --git a/software/support/config-fragments/autobuild/br-arm-basic.config b/buildroot/support/config-fragments/autobuild/br-arm-basic.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-basic.config
rename to buildroot/support/config-fragments/autobuild/br-arm-basic.config
diff --git a/software/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
rename to buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
diff --git a/software/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
rename to buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
diff --git a/software/support/config-fragments/autobuild/br-arm-full-nothread.config b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-full-nothread.config
rename to buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config
diff --git a/software/support/config-fragments/autobuild/br-arm-full-static.config b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-full-static.config
rename to buildroot/support/config-fragments/autobuild/br-arm-full-static.config
diff --git a/software/support/config-fragments/autobuild/br-arm-full.config b/buildroot/support/config-fragments/autobuild/br-arm-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-full.config
rename to buildroot/support/config-fragments/autobuild/br-arm-full.config
diff --git a/software/support/config-fragments/autobuild/br-arm-internal-full.config b/buildroot/support/config-fragments/autobuild/br-arm-internal-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-internal-full.config
rename to buildroot/support/config-fragments/autobuild/br-arm-internal-full.config
diff --git a/software/support/config-fragments/autobuild/br-arm-internal-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-internal-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-arm-internal-musl.config b/buildroot/support/config-fragments/autobuild/br-arm-internal-musl.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-arm-internal-musl.config
rename to buildroot/support/config-fragments/autobuild/br-arm-internal-musl.config
diff --git a/software/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
rename to buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
diff --git a/software/support/config-fragments/autobuild/br-i386-pentium4-full.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-i386-pentium4-full.config
rename to buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
diff --git a/software/support/config-fragments/autobuild/br-m68k-5208-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-m68k-5208-full.config
rename to buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config
diff --git a/software/support/config-fragments/autobuild/br-m68k-68040-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-m68k-68040-full.config
rename to buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config
diff --git a/software/support/config-fragments/autobuild/br-microblazeel-full-internal.config b/buildroot/support/config-fragments/autobuild/br-microblazeel-full-internal.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-microblazeel-full-internal.config
rename to buildroot/support/config-fragments/autobuild/br-microblazeel-full-internal.config
diff --git a/software/support/config-fragments/autobuild/br-microblazeel-full.config b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-microblazeel-full.config
rename to buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
diff --git a/software/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-mips64-n64-full.config b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-mips64-n64-full.config
rename to buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config
diff --git a/software/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-mipsel-o32-full.config b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-mipsel-o32-full.config
rename to buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config
diff --git a/software/support/config-fragments/autobuild/br-nios2-glibc.config b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-nios2-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-openrisc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-openrisc-uclibc.config
rename to buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config
diff --git a/software/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
rename to buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
diff --git a/software/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
rename to buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
diff --git a/software/support/config-fragments/autobuild/br-powerpc-internal-full.config b/buildroot/support/config-fragments/autobuild/br-powerpc-internal-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-powerpc-internal-full.config
rename to buildroot/support/config-fragments/autobuild/br-powerpc-internal-full.config
diff --git a/software/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-riscv32.config b/buildroot/support/config-fragments/autobuild/br-riscv32.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-riscv32.config
rename to buildroot/support/config-fragments/autobuild/br-riscv32.config
diff --git a/software/support/config-fragments/autobuild/br-riscv64-internal-musl.config b/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-riscv64-internal-musl.config
rename to buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config
diff --git a/software/support/config-fragments/autobuild/br-riscv64.config b/buildroot/support/config-fragments/autobuild/br-riscv64.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-riscv64.config
rename to buildroot/support/config-fragments/autobuild/br-riscv64.config
diff --git a/software/support/config-fragments/autobuild/br-sh4-full.config b/buildroot/support/config-fragments/autobuild/br-sh4-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-sh4-full.config
rename to buildroot/support/config-fragments/autobuild/br-sh4-full.config
diff --git a/software/support/config-fragments/autobuild/br-sparc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-sparc-uclibc.config
rename to buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
diff --git a/software/support/config-fragments/autobuild/br-sparc64-glibc.config b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-sparc64-glibc.config
rename to buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
diff --git a/software/support/config-fragments/autobuild/br-x86-64-core2-full.config b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-x86-64-core2-full.config
rename to buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
diff --git a/software/support/config-fragments/autobuild/br-x86-64-musl.config b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-x86-64-musl.config
rename to buildroot/support/config-fragments/autobuild/br-x86-64-musl.config
diff --git a/software/support/config-fragments/autobuild/br-xtensa-full-internal.config b/buildroot/support/config-fragments/autobuild/br-xtensa-full-internal.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-xtensa-full-internal.config
rename to buildroot/support/config-fragments/autobuild/br-xtensa-full-internal.config
diff --git a/software/support/config-fragments/autobuild/br-xtensa-full.config b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config
similarity index 100%
rename from software/support/config-fragments/autobuild/br-xtensa-full.config
rename to buildroot/support/config-fragments/autobuild/br-xtensa-full.config
diff --git a/software/support/config-fragments/autobuild/linaro-aarch64-be.config b/buildroot/support/config-fragments/autobuild/linaro-aarch64-be.config
similarity index 100%
rename from software/support/config-fragments/autobuild/linaro-aarch64-be.config
rename to buildroot/support/config-fragments/autobuild/linaro-aarch64-be.config
diff --git a/software/support/config-fragments/autobuild/linaro-aarch64.config b/buildroot/support/config-fragments/autobuild/linaro-aarch64.config
similarity index 100%
rename from software/support/config-fragments/autobuild/linaro-aarch64.config
rename to buildroot/support/config-fragments/autobuild/linaro-aarch64.config
diff --git a/software/support/config-fragments/autobuild/linaro-arm.config b/buildroot/support/config-fragments/autobuild/linaro-arm.config
similarity index 100%
rename from software/support/config-fragments/autobuild/linaro-arm.config
rename to buildroot/support/config-fragments/autobuild/linaro-arm.config
diff --git a/software/support/config-fragments/autobuild/sourcery-arm-armv4t.config b/buildroot/support/config-fragments/autobuild/sourcery-arm-armv4t.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-arm-armv4t.config
rename to buildroot/support/config-fragments/autobuild/sourcery-arm-armv4t.config
diff --git a/software/support/config-fragments/autobuild/sourcery-arm-thumb2.config b/buildroot/support/config-fragments/autobuild/sourcery-arm-thumb2.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-arm-thumb2.config
rename to buildroot/support/config-fragments/autobuild/sourcery-arm-thumb2.config
diff --git a/software/support/config-fragments/autobuild/sourcery-arm.config b/buildroot/support/config-fragments/autobuild/sourcery-arm.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-arm.config
rename to buildroot/support/config-fragments/autobuild/sourcery-arm.config
diff --git a/software/support/config-fragments/autobuild/sourcery-mips.config b/buildroot/support/config-fragments/autobuild/sourcery-mips.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-mips.config
rename to buildroot/support/config-fragments/autobuild/sourcery-mips.config
diff --git a/software/support/config-fragments/autobuild/sourcery-mips64.config b/buildroot/support/config-fragments/autobuild/sourcery-mips64.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-mips64.config
rename to buildroot/support/config-fragments/autobuild/sourcery-mips64.config
diff --git a/software/support/config-fragments/autobuild/sourcery-nios2.config b/buildroot/support/config-fragments/autobuild/sourcery-nios2.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-nios2.config
rename to buildroot/support/config-fragments/autobuild/sourcery-nios2.config
diff --git a/software/support/config-fragments/autobuild/sourcery-x86-64.config b/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config
similarity index 100%
rename from software/support/config-fragments/autobuild/sourcery-x86-64.config
rename to buildroot/support/config-fragments/autobuild/sourcery-x86-64.config
diff --git a/software/support/config-fragments/autobuild/toolchain-configs.csv b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv
similarity index 100%
rename from software/support/config-fragments/autobuild/toolchain-configs.csv
rename to buildroot/support/config-fragments/autobuild/toolchain-configs.csv
diff --git a/software/support/config-fragments/minimal.config b/buildroot/support/config-fragments/minimal.config
similarity index 100%
rename from software/support/config-fragments/minimal.config
rename to buildroot/support/config-fragments/minimal.config
diff --git a/software/support/dependencies/check-host-asciidoc.sh b/buildroot/support/dependencies/check-host-asciidoc.sh
similarity index 100%
rename from software/support/dependencies/check-host-asciidoc.sh
rename to buildroot/support/dependencies/check-host-asciidoc.sh
diff --git a/software/support/dependencies/check-host-bison-flex.mk b/buildroot/support/dependencies/check-host-bison-flex.mk
similarity index 100%
rename from software/support/dependencies/check-host-bison-flex.mk
rename to buildroot/support/dependencies/check-host-bison-flex.mk
diff --git a/software/support/dependencies/check-host-cmake.mk b/buildroot/support/dependencies/check-host-cmake.mk
similarity index 100%
rename from software/support/dependencies/check-host-cmake.mk
rename to buildroot/support/dependencies/check-host-cmake.mk
diff --git a/software/support/dependencies/check-host-cmake.sh b/buildroot/support/dependencies/check-host-cmake.sh
similarity index 100%
rename from software/support/dependencies/check-host-cmake.sh
rename to buildroot/support/dependencies/check-host-cmake.sh
diff --git a/software/support/dependencies/check-host-coreutils.mk b/buildroot/support/dependencies/check-host-coreutils.mk
similarity index 100%
rename from software/support/dependencies/check-host-coreutils.mk
rename to buildroot/support/dependencies/check-host-coreutils.mk
diff --git a/software/support/dependencies/check-host-coreutils.sh b/buildroot/support/dependencies/check-host-coreutils.sh
similarity index 100%
rename from software/support/dependencies/check-host-coreutils.sh
rename to buildroot/support/dependencies/check-host-coreutils.sh
diff --git a/software/support/dependencies/check-host-gzip.mk b/buildroot/support/dependencies/check-host-gzip.mk
similarity index 100%
rename from software/support/dependencies/check-host-gzip.mk
rename to buildroot/support/dependencies/check-host-gzip.mk
diff --git a/software/support/dependencies/check-host-gzip.sh b/buildroot/support/dependencies/check-host-gzip.sh
similarity index 100%
rename from software/support/dependencies/check-host-gzip.sh
rename to buildroot/support/dependencies/check-host-gzip.sh
diff --git a/software/support/dependencies/check-host-lzip.mk b/buildroot/support/dependencies/check-host-lzip.mk
similarity index 100%
rename from software/support/dependencies/check-host-lzip.mk
rename to buildroot/support/dependencies/check-host-lzip.mk
diff --git a/software/support/dependencies/check-host-lzip.sh b/buildroot/support/dependencies/check-host-lzip.sh
similarity index 100%
rename from software/support/dependencies/check-host-lzip.sh
rename to buildroot/support/dependencies/check-host-lzip.sh
diff --git a/software/support/dependencies/check-host-make.mk b/buildroot/support/dependencies/check-host-make.mk
similarity index 100%
rename from software/support/dependencies/check-host-make.mk
rename to buildroot/support/dependencies/check-host-make.mk
diff --git a/software/support/dependencies/check-host-make.sh b/buildroot/support/dependencies/check-host-make.sh
similarity index 100%
rename from software/support/dependencies/check-host-make.sh
rename to buildroot/support/dependencies/check-host-make.sh
diff --git a/software/support/dependencies/check-host-python3.mk b/buildroot/support/dependencies/check-host-python3.mk
similarity index 100%
rename from software/support/dependencies/check-host-python3.mk
rename to buildroot/support/dependencies/check-host-python3.mk
diff --git a/software/support/dependencies/check-host-python3.sh b/buildroot/support/dependencies/check-host-python3.sh
similarity index 100%
rename from software/support/dependencies/check-host-python3.sh
rename to buildroot/support/dependencies/check-host-python3.sh
diff --git a/software/support/dependencies/check-host-tar.mk b/buildroot/support/dependencies/check-host-tar.mk
similarity index 100%
rename from software/support/dependencies/check-host-tar.mk
rename to buildroot/support/dependencies/check-host-tar.mk
diff --git a/software/support/dependencies/check-host-tar.sh b/buildroot/support/dependencies/check-host-tar.sh
similarity index 100%
rename from software/support/dependencies/check-host-tar.sh
rename to buildroot/support/dependencies/check-host-tar.sh
diff --git a/software/support/dependencies/check-host-xzcat.mk b/buildroot/support/dependencies/check-host-xzcat.mk
similarity index 100%
rename from software/support/dependencies/check-host-xzcat.mk
rename to buildroot/support/dependencies/check-host-xzcat.mk
diff --git a/software/support/dependencies/check-host-xzcat.sh b/buildroot/support/dependencies/check-host-xzcat.sh
similarity index 100%
rename from software/support/dependencies/check-host-xzcat.sh
rename to buildroot/support/dependencies/check-host-xzcat.sh
diff --git a/software/support/dependencies/dependencies.mk b/buildroot/support/dependencies/dependencies.mk
similarity index 100%
rename from software/support/dependencies/dependencies.mk
rename to buildroot/support/dependencies/dependencies.mk
diff --git a/software/support/dependencies/dependencies.sh b/buildroot/support/dependencies/dependencies.sh
similarity index 100%
rename from software/support/dependencies/dependencies.sh
rename to buildroot/support/dependencies/dependencies.sh
diff --git a/software/support/docker/Dockerfile b/buildroot/support/docker/Dockerfile
similarity index 100%
rename from software/support/docker/Dockerfile
rename to buildroot/support/docker/Dockerfile
diff --git a/software/support/docker/apt-sources.list b/buildroot/support/docker/apt-sources.list
similarity index 100%
rename from software/support/docker/apt-sources.list
rename to buildroot/support/docker/apt-sources.list
diff --git a/software/support/download/bzr b/buildroot/support/download/bzr
similarity index 100%
rename from software/support/download/bzr
rename to buildroot/support/download/bzr
diff --git a/software/support/download/check-hash b/buildroot/support/download/check-hash
similarity index 100%
rename from software/support/download/check-hash
rename to buildroot/support/download/check-hash
diff --git a/software/support/download/cvs b/buildroot/support/download/cvs
similarity index 100%
rename from software/support/download/cvs
rename to buildroot/support/download/cvs
diff --git a/software/support/download/dl-wrapper b/buildroot/support/download/dl-wrapper
similarity index 100%
rename from software/support/download/dl-wrapper
rename to buildroot/support/download/dl-wrapper
diff --git a/software/support/download/file b/buildroot/support/download/file
similarity index 100%
rename from software/support/download/file
rename to buildroot/support/download/file
diff --git a/software/support/download/git b/buildroot/support/download/git
similarity index 100%
rename from software/support/download/git
rename to buildroot/support/download/git
diff --git a/software/support/download/hg b/buildroot/support/download/hg
similarity index 100%
rename from software/support/download/hg
rename to buildroot/support/download/hg
diff --git a/software/support/download/scp b/buildroot/support/download/scp
similarity index 100%
rename from software/support/download/scp
rename to buildroot/support/download/scp
diff --git a/software/support/download/svn b/buildroot/support/download/svn
similarity index 100%
rename from software/support/download/svn
rename to buildroot/support/download/svn
diff --git a/software/support/download/wget b/buildroot/support/download/wget
similarity index 100%
rename from software/support/download/wget
rename to buildroot/support/download/wget
diff --git a/software/support/gnuconfig/README.buildroot b/buildroot/support/gnuconfig/README.buildroot
similarity index 100%
rename from software/support/gnuconfig/README.buildroot
rename to buildroot/support/gnuconfig/README.buildroot
diff --git a/software/support/gnuconfig/config.guess b/buildroot/support/gnuconfig/config.guess
similarity index 100%
rename from software/support/gnuconfig/config.guess
rename to buildroot/support/gnuconfig/config.guess
diff --git a/software/support/gnuconfig/config.sub b/buildroot/support/gnuconfig/config.sub
similarity index 100%
rename from software/support/gnuconfig/config.sub
rename to buildroot/support/gnuconfig/config.sub
diff --git a/software/support/kconfig/.gitignore b/buildroot/support/kconfig/.gitignore
similarity index 100%
rename from software/support/kconfig/.gitignore
rename to buildroot/support/kconfig/.gitignore
diff --git a/software/support/kconfig/Makefile b/buildroot/support/kconfig/Makefile
similarity index 100%
rename from software/support/kconfig/Makefile
rename to buildroot/support/kconfig/Makefile
diff --git a/software/support/kconfig/Makefile.br b/buildroot/support/kconfig/Makefile.br
similarity index 100%
rename from software/support/kconfig/Makefile.br
rename to buildroot/support/kconfig/Makefile.br
diff --git a/software/support/kconfig/POTFILES.in b/buildroot/support/kconfig/POTFILES.in
similarity index 100%
rename from software/support/kconfig/POTFILES.in
rename to buildroot/support/kconfig/POTFILES.in
diff --git a/software/support/kconfig/README.buildroot b/buildroot/support/kconfig/README.buildroot
similarity index 100%
rename from software/support/kconfig/README.buildroot
rename to buildroot/support/kconfig/README.buildroot
diff --git a/software/support/kconfig/check.sh b/buildroot/support/kconfig/check.sh
similarity index 100%
rename from software/support/kconfig/check.sh
rename to buildroot/support/kconfig/check.sh
diff --git a/software/support/kconfig/conf.c b/buildroot/support/kconfig/conf.c
similarity index 100%
rename from software/support/kconfig/conf.c
rename to buildroot/support/kconfig/conf.c
diff --git a/software/support/kconfig/confdata.c b/buildroot/support/kconfig/confdata.c
similarity index 100%
rename from software/support/kconfig/confdata.c
rename to buildroot/support/kconfig/confdata.c
diff --git a/software/support/kconfig/expr.c b/buildroot/support/kconfig/expr.c
similarity index 100%
rename from software/support/kconfig/expr.c
rename to buildroot/support/kconfig/expr.c
diff --git a/software/support/kconfig/expr.h b/buildroot/support/kconfig/expr.h
similarity index 100%
rename from software/support/kconfig/expr.h
rename to buildroot/support/kconfig/expr.h
diff --git a/software/support/kconfig/foo.h b/buildroot/support/kconfig/foo.h
similarity index 100%
rename from software/support/kconfig/foo.h
rename to buildroot/support/kconfig/foo.h
diff --git a/software/support/kconfig/gconf.c b/buildroot/support/kconfig/gconf.c
similarity index 100%
rename from software/support/kconfig/gconf.c
rename to buildroot/support/kconfig/gconf.c
diff --git a/software/support/kconfig/gconf.glade b/buildroot/support/kconfig/gconf.glade
similarity index 100%
rename from software/support/kconfig/gconf.glade
rename to buildroot/support/kconfig/gconf.glade
diff --git a/software/support/kconfig/images.c b/buildroot/support/kconfig/images.c
similarity index 100%
rename from software/support/kconfig/images.c
rename to buildroot/support/kconfig/images.c
diff --git a/software/support/kconfig/kconf_id.c b/buildroot/support/kconfig/kconf_id.c
similarity index 100%
rename from software/support/kconfig/kconf_id.c
rename to buildroot/support/kconfig/kconf_id.c
diff --git a/software/support/kconfig/kxgettext.c b/buildroot/support/kconfig/kxgettext.c
similarity index 100%
rename from software/support/kconfig/kxgettext.c
rename to buildroot/support/kconfig/kxgettext.c
diff --git a/software/support/kconfig/list.h b/buildroot/support/kconfig/list.h
similarity index 100%
rename from software/support/kconfig/list.h
rename to buildroot/support/kconfig/list.h
diff --git a/software/support/kconfig/lkc.h b/buildroot/support/kconfig/lkc.h
similarity index 100%
rename from software/support/kconfig/lkc.h
rename to buildroot/support/kconfig/lkc.h
diff --git a/software/support/kconfig/lkc_proto.h b/buildroot/support/kconfig/lkc_proto.h
similarity index 100%
rename from software/support/kconfig/lkc_proto.h
rename to buildroot/support/kconfig/lkc_proto.h
diff --git a/software/support/kconfig/lxdialog/.gitignore b/buildroot/support/kconfig/lxdialog/.gitignore
similarity index 100%
rename from software/support/kconfig/lxdialog/.gitignore
rename to buildroot/support/kconfig/lxdialog/.gitignore
diff --git a/software/support/kconfig/lxdialog/BIG.FAT.WARNING b/buildroot/support/kconfig/lxdialog/BIG.FAT.WARNING
similarity index 100%
rename from software/support/kconfig/lxdialog/BIG.FAT.WARNING
rename to buildroot/support/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/software/support/kconfig/lxdialog/check-lxdialog.sh b/buildroot/support/kconfig/lxdialog/check-lxdialog.sh
similarity index 100%
rename from software/support/kconfig/lxdialog/check-lxdialog.sh
rename to buildroot/support/kconfig/lxdialog/check-lxdialog.sh
diff --git a/software/support/kconfig/lxdialog/checklist.c b/buildroot/support/kconfig/lxdialog/checklist.c
similarity index 100%
rename from software/support/kconfig/lxdialog/checklist.c
rename to buildroot/support/kconfig/lxdialog/checklist.c
diff --git a/software/support/kconfig/lxdialog/dialog.h b/buildroot/support/kconfig/lxdialog/dialog.h
similarity index 100%
rename from software/support/kconfig/lxdialog/dialog.h
rename to buildroot/support/kconfig/lxdialog/dialog.h
diff --git a/software/support/kconfig/lxdialog/inputbox.c b/buildroot/support/kconfig/lxdialog/inputbox.c
similarity index 100%
rename from software/support/kconfig/lxdialog/inputbox.c
rename to buildroot/support/kconfig/lxdialog/inputbox.c
diff --git a/software/support/kconfig/lxdialog/menubox.c b/buildroot/support/kconfig/lxdialog/menubox.c
similarity index 100%
rename from software/support/kconfig/lxdialog/menubox.c
rename to buildroot/support/kconfig/lxdialog/menubox.c
diff --git a/software/support/kconfig/lxdialog/textbox.c b/buildroot/support/kconfig/lxdialog/textbox.c
similarity index 100%
rename from software/support/kconfig/lxdialog/textbox.c
rename to buildroot/support/kconfig/lxdialog/textbox.c
diff --git a/software/support/kconfig/lxdialog/util.c b/buildroot/support/kconfig/lxdialog/util.c
similarity index 100%
rename from software/support/kconfig/lxdialog/util.c
rename to buildroot/support/kconfig/lxdialog/util.c
diff --git a/software/support/kconfig/lxdialog/yesno.c b/buildroot/support/kconfig/lxdialog/yesno.c
similarity index 100%
rename from software/support/kconfig/lxdialog/yesno.c
rename to buildroot/support/kconfig/lxdialog/yesno.c
diff --git a/software/support/kconfig/mconf.c b/buildroot/support/kconfig/mconf.c
similarity index 100%
rename from software/support/kconfig/mconf.c
rename to buildroot/support/kconfig/mconf.c
diff --git a/software/support/kconfig/menu.c b/buildroot/support/kconfig/menu.c
similarity index 100%
rename from software/support/kconfig/menu.c
rename to buildroot/support/kconfig/menu.c
diff --git a/software/support/kconfig/merge_config.sh b/buildroot/support/kconfig/merge_config.sh
similarity index 100%
rename from software/support/kconfig/merge_config.sh
rename to buildroot/support/kconfig/merge_config.sh
diff --git a/software/support/kconfig/nconf.c b/buildroot/support/kconfig/nconf.c
similarity index 100%
rename from software/support/kconfig/nconf.c
rename to buildroot/support/kconfig/nconf.c
diff --git a/software/support/kconfig/nconf.gui.c b/buildroot/support/kconfig/nconf.gui.c
similarity index 100%
rename from software/support/kconfig/nconf.gui.c
rename to buildroot/support/kconfig/nconf.gui.c
diff --git a/software/support/kconfig/nconf.h b/buildroot/support/kconfig/nconf.h
similarity index 100%
rename from software/support/kconfig/nconf.h
rename to buildroot/support/kconfig/nconf.h
diff --git a/software/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/buildroot/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
similarity index 100%
rename from software/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
rename to buildroot/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
diff --git a/software/support/kconfig/patches/06-br-build-system-integration.patch b/buildroot/support/kconfig/patches/06-br-build-system-integration.patch
similarity index 100%
rename from software/support/kconfig/patches/06-br-build-system-integration.patch
rename to buildroot/support/kconfig/patches/06-br-build-system-integration.patch
diff --git a/software/support/kconfig/patches/10-br-build-system.patch b/buildroot/support/kconfig/patches/10-br-build-system.patch
similarity index 100%
rename from software/support/kconfig/patches/10-br-build-system.patch
rename to buildroot/support/kconfig/patches/10-br-build-system.patch
diff --git a/software/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch b/buildroot/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
similarity index 100%
rename from software/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
rename to buildroot/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
diff --git a/software/support/kconfig/patches/12-fix-glade-file-path.patch b/buildroot/support/kconfig/patches/12-fix-glade-file-path.patch
similarity index 100%
rename from software/support/kconfig/patches/12-fix-glade-file-path.patch
rename to buildroot/support/kconfig/patches/12-fix-glade-file-path.patch
diff --git a/software/support/kconfig/patches/14-support-out-of-tree-config.patch b/buildroot/support/kconfig/patches/14-support-out-of-tree-config.patch
similarity index 100%
rename from software/support/kconfig/patches/14-support-out-of-tree-config.patch
rename to buildroot/support/kconfig/patches/14-support-out-of-tree-config.patch
diff --git a/software/support/kconfig/patches/16-fix-space-to-de-select-options.patch b/buildroot/support/kconfig/patches/16-fix-space-to-de-select-options.patch
similarity index 100%
rename from software/support/kconfig/patches/16-fix-space-to-de-select-options.patch
rename to buildroot/support/kconfig/patches/16-fix-space-to-de-select-options.patch
diff --git a/software/support/kconfig/patches/17-backport-kecho.patch b/buildroot/support/kconfig/patches/17-backport-kecho.patch
similarity index 100%
rename from software/support/kconfig/patches/17-backport-kecho.patch
rename to buildroot/support/kconfig/patches/17-backport-kecho.patch
diff --git a/software/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch b/buildroot/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch
similarity index 100%
rename from software/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch
rename to buildroot/support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch
diff --git a/software/support/kconfig/patches/19-merge_config.sh-add-br2-external-support.patch b/buildroot/support/kconfig/patches/19-merge_config.sh-add-br2-external-support.patch
similarity index 100%
rename from software/support/kconfig/patches/19-merge_config.sh-add-br2-external-support.patch
rename to buildroot/support/kconfig/patches/19-merge_config.sh-add-br2-external-support.patch
diff --git a/software/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch b/buildroot/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
similarity index 100%
rename from software/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
rename to buildroot/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
diff --git a/software/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch b/buildroot/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch
similarity index 100%
rename from software/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch
rename to buildroot/support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch
diff --git a/software/support/kconfig/patches/series b/buildroot/support/kconfig/patches/series
similarity index 100%
rename from software/support/kconfig/patches/series
rename to buildroot/support/kconfig/patches/series
diff --git a/software/support/kconfig/qconf.cc b/buildroot/support/kconfig/qconf.cc
similarity index 100%
rename from software/support/kconfig/qconf.cc
rename to buildroot/support/kconfig/qconf.cc
diff --git a/software/support/kconfig/qconf.h b/buildroot/support/kconfig/qconf.h
similarity index 100%
rename from software/support/kconfig/qconf.h
rename to buildroot/support/kconfig/qconf.h
diff --git a/software/support/kconfig/streamline_config.pl b/buildroot/support/kconfig/streamline_config.pl
similarity index 100%
rename from software/support/kconfig/streamline_config.pl
rename to buildroot/support/kconfig/streamline_config.pl
diff --git a/software/support/kconfig/symbol.c b/buildroot/support/kconfig/symbol.c
similarity index 100%
rename from software/support/kconfig/symbol.c
rename to buildroot/support/kconfig/symbol.c
diff --git a/software/support/kconfig/util.c b/buildroot/support/kconfig/util.c
similarity index 100%
rename from software/support/kconfig/util.c
rename to buildroot/support/kconfig/util.c
diff --git a/software/support/kconfig/zconf.l b/buildroot/support/kconfig/zconf.l
similarity index 100%
rename from software/support/kconfig/zconf.l
rename to buildroot/support/kconfig/zconf.l
diff --git a/software/support/kconfig/zconf.lex.c_shipped b/buildroot/support/kconfig/zconf.lex.c_shipped
similarity index 100%
rename from software/support/kconfig/zconf.lex.c_shipped
rename to buildroot/support/kconfig/zconf.lex.c_shipped
diff --git a/software/support/kconfig/zconf.tab.c_shipped b/buildroot/support/kconfig/zconf.tab.c_shipped
similarity index 100%
rename from software/support/kconfig/zconf.tab.c_shipped
rename to buildroot/support/kconfig/zconf.tab.c_shipped
diff --git a/software/support/kconfig/zconf.y b/buildroot/support/kconfig/zconf.y
similarity index 100%
rename from software/support/kconfig/zconf.y
rename to buildroot/support/kconfig/zconf.y
diff --git a/software/support/legal-info/README.header b/buildroot/support/legal-info/README.header
similarity index 100%
rename from software/support/legal-info/README.header
rename to buildroot/support/legal-info/README.header
diff --git a/software/support/legal-info/README.warnings-header b/buildroot/support/legal-info/README.warnings-header
similarity index 100%
rename from software/support/legal-info/README.warnings-header
rename to buildroot/support/legal-info/README.warnings-header
diff --git a/software/support/legal-info/buildroot.hash b/buildroot/support/legal-info/buildroot.hash
similarity index 100%
rename from software/support/legal-info/buildroot.hash
rename to buildroot/support/legal-info/buildroot.hash
diff --git a/software/support/libtool/buildroot-libtool-v1.5.patch b/buildroot/support/libtool/buildroot-libtool-v1.5.patch
similarity index 100%
rename from software/support/libtool/buildroot-libtool-v1.5.patch
rename to buildroot/support/libtool/buildroot-libtool-v1.5.patch
diff --git a/software/support/libtool/buildroot-libtool-v2.2.patch b/buildroot/support/libtool/buildroot-libtool-v2.2.patch
similarity index 100%
rename from software/support/libtool/buildroot-libtool-v2.2.patch
rename to buildroot/support/libtool/buildroot-libtool-v2.2.patch
diff --git a/software/support/libtool/buildroot-libtool-v2.4.4.patch b/buildroot/support/libtool/buildroot-libtool-v2.4.4.patch
similarity index 100%
rename from software/support/libtool/buildroot-libtool-v2.4.4.patch
rename to buildroot/support/libtool/buildroot-libtool-v2.4.4.patch
diff --git a/software/support/libtool/buildroot-libtool-v2.4.patch b/buildroot/support/libtool/buildroot-libtool-v2.4.patch
similarity index 100%
rename from software/support/libtool/buildroot-libtool-v2.4.patch
rename to buildroot/support/libtool/buildroot-libtool-v2.4.patch
diff --git a/software/support/misc/Buildroot.cmake b/buildroot/support/misc/Buildroot.cmake
similarity index 100%
rename from software/support/misc/Buildroot.cmake
rename to buildroot/support/misc/Buildroot.cmake
diff --git a/software/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile
similarity index 100%
rename from software/support/misc/Vagrantfile
rename to buildroot/support/misc/Vagrantfile
diff --git a/software/support/misc/relocate-sdk.sh b/buildroot/support/misc/relocate-sdk.sh
similarity index 100%
rename from software/support/misc/relocate-sdk.sh
rename to buildroot/support/misc/relocate-sdk.sh
diff --git a/software/support/misc/target-dir-warning.txt b/buildroot/support/misc/target-dir-warning.txt
similarity index 100%
rename from software/support/misc/target-dir-warning.txt
rename to buildroot/support/misc/target-dir-warning.txt
diff --git a/software/support/misc/toolchainfile.cmake.in b/buildroot/support/misc/toolchainfile.cmake.in
similarity index 100%
rename from software/support/misc/toolchainfile.cmake.in
rename to buildroot/support/misc/toolchainfile.cmake.in
diff --git a/software/support/misc/utils.mk b/buildroot/support/misc/utils.mk
similarity index 100%
rename from software/support/misc/utils.mk
rename to buildroot/support/misc/utils.mk
diff --git a/software/support/scripts/apply-patches.sh b/buildroot/support/scripts/apply-patches.sh
similarity index 100%
rename from software/support/scripts/apply-patches.sh
rename to buildroot/support/scripts/apply-patches.sh
diff --git a/software/support/scripts/br2-external b/buildroot/support/scripts/br2-external
similarity index 100%
rename from software/support/scripts/br2-external
rename to buildroot/support/scripts/br2-external
diff --git a/software/support/scripts/brpkgutil.py b/buildroot/support/scripts/brpkgutil.py
similarity index 100%
rename from software/support/scripts/brpkgutil.py
rename to buildroot/support/scripts/brpkgutil.py
diff --git a/software/support/scripts/check-bin-arch b/buildroot/support/scripts/check-bin-arch
similarity index 100%
rename from software/support/scripts/check-bin-arch
rename to buildroot/support/scripts/check-bin-arch
diff --git a/software/support/scripts/check-host-rpath b/buildroot/support/scripts/check-host-rpath
similarity index 100%
rename from software/support/scripts/check-host-rpath
rename to buildroot/support/scripts/check-host-rpath
diff --git a/software/support/scripts/check-kernel-headers.sh b/buildroot/support/scripts/check-kernel-headers.sh
similarity index 100%
rename from software/support/scripts/check-kernel-headers.sh
rename to buildroot/support/scripts/check-kernel-headers.sh
diff --git a/software/support/scripts/check-merged-usr.sh b/buildroot/support/scripts/check-merged-usr.sh
similarity index 100%
rename from software/support/scripts/check-merged-usr.sh
rename to buildroot/support/scripts/check-merged-usr.sh
diff --git a/software/support/scripts/eclipse-register-toolchain b/buildroot/support/scripts/eclipse-register-toolchain
similarity index 100%
rename from software/support/scripts/eclipse-register-toolchain
rename to buildroot/support/scripts/eclipse-register-toolchain
diff --git a/software/support/scripts/expunge-gconv-modules b/buildroot/support/scripts/expunge-gconv-modules
similarity index 100%
rename from software/support/scripts/expunge-gconv-modules
rename to buildroot/support/scripts/expunge-gconv-modules
diff --git a/software/support/scripts/fix-configure-powerpc64.sh b/buildroot/support/scripts/fix-configure-powerpc64.sh
similarity index 100%
rename from software/support/scripts/fix-configure-powerpc64.sh
rename to buildroot/support/scripts/fix-configure-powerpc64.sh
diff --git a/software/support/scripts/fix-rpath b/buildroot/support/scripts/fix-rpath
similarity index 100%
rename from software/support/scripts/fix-rpath
rename to buildroot/support/scripts/fix-rpath
diff --git a/software/support/scripts/generate-gitlab-ci-yml b/buildroot/support/scripts/generate-gitlab-ci-yml
similarity index 100%
rename from software/support/scripts/generate-gitlab-ci-yml
rename to buildroot/support/scripts/generate-gitlab-ci-yml
diff --git a/software/support/scripts/genimage.sh b/buildroot/support/scripts/genimage.sh
similarity index 100%
rename from software/support/scripts/genimage.sh
rename to buildroot/support/scripts/genimage.sh
diff --git a/software/support/scripts/graph-build-time b/buildroot/support/scripts/graph-build-time
similarity index 100%
rename from software/support/scripts/graph-build-time
rename to buildroot/support/scripts/graph-build-time
diff --git a/software/support/scripts/graph-depends b/buildroot/support/scripts/graph-depends
similarity index 100%
rename from software/support/scripts/graph-depends
rename to buildroot/support/scripts/graph-depends
diff --git a/software/support/scripts/hardlink-or-copy b/buildroot/support/scripts/hardlink-or-copy
similarity index 100%
rename from software/support/scripts/hardlink-or-copy
rename to buildroot/support/scripts/hardlink-or-copy
diff --git a/software/support/scripts/mkmakefile b/buildroot/support/scripts/mkmakefile
similarity index 100%
rename from software/support/scripts/mkmakefile
rename to buildroot/support/scripts/mkmakefile
diff --git a/software/support/scripts/mkusers b/buildroot/support/scripts/mkusers
similarity index 100%
rename from software/support/scripts/mkusers
rename to buildroot/support/scripts/mkusers
diff --git a/software/support/scripts/pkg-stats b/buildroot/support/scripts/pkg-stats
similarity index 100%
rename from software/support/scripts/pkg-stats
rename to buildroot/support/scripts/pkg-stats
diff --git a/software/support/scripts/pycompile.py b/buildroot/support/scripts/pycompile.py
similarity index 100%
rename from software/support/scripts/pycompile.py
rename to buildroot/support/scripts/pycompile.py
diff --git a/software/support/scripts/setlocalversion b/buildroot/support/scripts/setlocalversion
similarity index 100%
rename from software/support/scripts/setlocalversion
rename to buildroot/support/scripts/setlocalversion
diff --git a/software/support/scripts/size-stats b/buildroot/support/scripts/size-stats
similarity index 100%
rename from software/support/scripts/size-stats
rename to buildroot/support/scripts/size-stats
diff --git a/software/support/testing/conf/binfmt-misc-kernel-fragment.config b/buildroot/support/testing/conf/binfmt-misc-kernel-fragment.config
similarity index 100%
rename from software/support/testing/conf/binfmt-misc-kernel-fragment.config
rename to buildroot/support/testing/conf/binfmt-misc-kernel-fragment.config
diff --git a/software/support/testing/conf/docker-compose-kernel.config b/buildroot/support/testing/conf/docker-compose-kernel.config
similarity index 100%
rename from software/support/testing/conf/docker-compose-kernel.config
rename to buildroot/support/testing/conf/docker-compose-kernel.config
diff --git a/software/support/testing/conf/docker-compose.yml b/buildroot/support/testing/conf/docker-compose.yml
similarity index 100%
rename from software/support/testing/conf/docker-compose.yml
rename to buildroot/support/testing/conf/docker-compose.yml
diff --git a/software/support/testing/conf/f2fs-kernel-fragment.config b/buildroot/support/testing/conf/f2fs-kernel-fragment.config
similarity index 100%
rename from software/support/testing/conf/f2fs-kernel-fragment.config
rename to buildroot/support/testing/conf/f2fs-kernel-fragment.config
diff --git a/software/support/testing/conf/grub2.cfg b/buildroot/support/testing/conf/grub2.cfg
similarity index 100%
rename from software/support/testing/conf/grub2.cfg
rename to buildroot/support/testing/conf/grub2.cfg
diff --git a/software/support/testing/conf/isolinux.cfg b/buildroot/support/testing/conf/isolinux.cfg
similarity index 100%
rename from software/support/testing/conf/isolinux.cfg
rename to buildroot/support/testing/conf/isolinux.cfg
diff --git a/software/support/testing/conf/minimal-x86-qemu-kernel.config b/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config
similarity index 100%
rename from software/support/testing/conf/minimal-x86-qemu-kernel.config
rename to buildroot/support/testing/conf/minimal-x86-qemu-kernel.config
diff --git a/software/support/testing/conf/unittest.cfg b/buildroot/support/testing/conf/unittest.cfg
similarity index 100%
rename from software/support/testing/conf/unittest.cfg
rename to buildroot/support/testing/conf/unittest.cfg
diff --git a/software/support/testing/infra/__init__.py b/buildroot/support/testing/infra/__init__.py
similarity index 100%
rename from software/support/testing/infra/__init__.py
rename to buildroot/support/testing/infra/__init__.py
diff --git a/software/support/testing/infra/basetest.py b/buildroot/support/testing/infra/basetest.py
similarity index 100%
rename from software/support/testing/infra/basetest.py
rename to buildroot/support/testing/infra/basetest.py
diff --git a/software/support/testing/infra/builder.py b/buildroot/support/testing/infra/builder.py
similarity index 100%
rename from software/support/testing/infra/builder.py
rename to buildroot/support/testing/infra/builder.py
diff --git a/software/support/testing/infra/emulator.py b/buildroot/support/testing/infra/emulator.py
similarity index 100%
rename from software/support/testing/infra/emulator.py
rename to buildroot/support/testing/infra/emulator.py
diff --git a/software/support/testing/run-tests b/buildroot/support/testing/run-tests
similarity index 100%
rename from software/support/testing/run-tests
rename to buildroot/support/testing/run-tests
diff --git a/software/support/testing/tests/__init__.py b/buildroot/support/testing/tests/__init__.py
similarity index 100%
rename from software/support/testing/tests/__init__.py
rename to buildroot/support/testing/tests/__init__.py
diff --git a/software/support/testing/tests/boot/__init__.py b/buildroot/support/testing/tests/boot/__init__.py
similarity index 100%
rename from software/support/testing/tests/boot/__init__.py
rename to buildroot/support/testing/tests/boot/__init__.py
diff --git a/software/support/testing/tests/boot/test_atf.py b/buildroot/support/testing/tests/boot/test_atf.py
similarity index 100%
rename from software/support/testing/tests/boot/test_atf.py
rename to buildroot/support/testing/tests/boot/test_atf.py
diff --git a/software/support/testing/tests/core/__init__.py b/buildroot/support/testing/tests/core/__init__.py
similarity index 100%
rename from software/support/testing/tests/core/__init__.py
rename to buildroot/support/testing/tests/core/__init__.py
diff --git a/software/support/testing/tests/core/device_table2.txt b/buildroot/support/testing/tests/core/device_table2.txt
similarity index 100%
rename from software/support/testing/tests/core/device_table2.txt
rename to buildroot/support/testing/tests/core/device_table2.txt
diff --git a/software/support/testing/tests/core/post-build.sh b/buildroot/support/testing/tests/core/post-build.sh
similarity index 100%
rename from software/support/testing/tests/core/post-build.sh
rename to buildroot/support/testing/tests/core/post-build.sh
diff --git a/software/support/testing/tests/core/post-fakeroot.sh b/buildroot/support/testing/tests/core/post-fakeroot.sh
similarity index 100%
rename from software/support/testing/tests/core/post-fakeroot.sh
rename to buildroot/support/testing/tests/core/post-fakeroot.sh
diff --git a/software/support/testing/tests/core/post-image.sh b/buildroot/support/testing/tests/core/post-image.sh
similarity index 100%
rename from software/support/testing/tests/core/post-image.sh
rename to buildroot/support/testing/tests/core/post-image.sh
diff --git a/software/support/testing/tests/core/rootfs-overlay1/test-file1 b/buildroot/support/testing/tests/core/rootfs-overlay1/test-file1
similarity index 100%
rename from software/support/testing/tests/core/rootfs-overlay1/test-file1
rename to buildroot/support/testing/tests/core/rootfs-overlay1/test-file1
diff --git a/software/support/testing/tests/core/rootfs-overlay2/etc/test-file2 b/buildroot/support/testing/tests/core/rootfs-overlay2/etc/test-file2
similarity index 100%
rename from software/support/testing/tests/core/rootfs-overlay2/etc/test-file2
rename to buildroot/support/testing/tests/core/rootfs-overlay2/etc/test-file2
diff --git a/software/support/testing/tests/core/squashfs-xattr-kernel.config b/buildroot/support/testing/tests/core/squashfs-xattr-kernel.config
similarity index 100%
rename from software/support/testing/tests/core/squashfs-xattr-kernel.config
rename to buildroot/support/testing/tests/core/squashfs-xattr-kernel.config
diff --git a/software/support/testing/tests/core/test_file_capabilities.py b/buildroot/support/testing/tests/core/test_file_capabilities.py
similarity index 100%
rename from software/support/testing/tests/core/test_file_capabilities.py
rename to buildroot/support/testing/tests/core/test_file_capabilities.py
diff --git a/software/support/testing/tests/core/test_hardening.py b/buildroot/support/testing/tests/core/test_hardening.py
similarity index 100%
rename from software/support/testing/tests/core/test_hardening.py
rename to buildroot/support/testing/tests/core/test_hardening.py
diff --git a/software/support/testing/tests/core/test_post_scripts.py b/buildroot/support/testing/tests/core/test_post_scripts.py
similarity index 100%
rename from software/support/testing/tests/core/test_post_scripts.py
rename to buildroot/support/testing/tests/core/test_post_scripts.py
diff --git a/software/support/testing/tests/core/test_root_password.py b/buildroot/support/testing/tests/core/test_root_password.py
similarity index 100%
rename from software/support/testing/tests/core/test_root_password.py
rename to buildroot/support/testing/tests/core/test_root_password.py
diff --git a/software/support/testing/tests/core/test_rootfs_overlay.py b/buildroot/support/testing/tests/core/test_rootfs_overlay.py
similarity index 100%
rename from software/support/testing/tests/core/test_rootfs_overlay.py
rename to buildroot/support/testing/tests/core/test_rootfs_overlay.py
diff --git a/software/support/testing/tests/core/test_timezone.py b/buildroot/support/testing/tests/core/test_timezone.py
similarity index 100%
rename from software/support/testing/tests/core/test_timezone.py
rename to buildroot/support/testing/tests/core/test_timezone.py
diff --git a/software/support/testing/tests/download/__init__.py b/buildroot/support/testing/tests/download/__init__.py
similarity index 100%
rename from software/support/testing/tests/download/__init__.py
rename to buildroot/support/testing/tests/download/__init__.py
diff --git a/software/support/testing/tests/download/br2-external/git-hash/Config.in b/buildroot/support/testing/tests/download/br2-external/git-hash/Config.in
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/Config.in
rename to buildroot/support/testing/tests/download/br2-external/git-hash/Config.in
diff --git a/software/support/testing/tests/download/br2-external/git-hash/external.desc b/buildroot/support/testing/tests/download/br2-external/git-hash/external.desc
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/external.desc
rename to buildroot/support/testing/tests/download/br2-external/git-hash/external.desc
diff --git a/software/support/testing/tests/download/br2-external/git-hash/external.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/external.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/external.mk
rename to buildroot/support/testing/tests/download/br2-external/git-hash/external.mk
diff --git a/software/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
rename to buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
diff --git a/software/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
rename to buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
diff --git a/software/support/testing/tests/download/br2-external/git-hash/package/good/good.hash b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/package/good/good.hash
rename to buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash
diff --git a/software/support/testing/tests/download/br2-external/git-hash/package/good/good.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/package/good/good.mk
rename to buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.mk
diff --git a/software/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk b/buildroot/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
rename to buildroot/support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/Config.in b/buildroot/support/testing/tests/download/br2-external/git-refs/Config.in
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/Config.in
rename to buildroot/support/testing/tests/download/br2-external/git-refs/Config.in
diff --git a/software/support/testing/tests/download/br2-external/git-refs/external.desc b/buildroot/support/testing/tests/download/br2-external/git-refs/external.desc
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/external.desc
rename to buildroot/support/testing/tests/download/br2-external/git-refs/external.desc
diff --git a/software/support/testing/tests/download/br2-external/git-refs/external.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/external.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/external.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/external.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk
diff --git a/software/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk
similarity index 100%
rename from software/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk
rename to buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/HEAD b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/HEAD
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/HEAD
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/HEAD
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/config b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/config
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/config
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/config
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3 b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3
diff --git a/software/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule b/buildroot/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule
rename to buildroot/support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/HEAD b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/HEAD
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/HEAD
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/HEAD
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/config b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/config
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/config
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/config
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310 b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310
diff --git a/software/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule b/buildroot/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule
similarity index 100%
rename from software/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule
rename to buildroot/support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule
diff --git a/software/support/testing/tests/download/git-remote/repo.git/.gitattributes b/buildroot/support/testing/tests/download/git-remote/repo.git/.gitattributes
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/.gitattributes
rename to buildroot/support/testing/tests/download/git-remote/repo.git/.gitattributes
diff --git a/software/support/testing/tests/download/git-remote/repo.git/HEAD b/buildroot/support/testing/tests/download/git-remote/repo.git/HEAD
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/HEAD
rename to buildroot/support/testing/tests/download/git-remote/repo.git/HEAD
diff --git a/software/support/testing/tests/download/git-remote/repo.git/config b/buildroot/support/testing/tests/download/git-remote/repo.git/config
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/config
rename to buildroot/support/testing/tests/download/git-remote/repo.git/config
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc
diff --git a/software/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5 b/buildroot/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5
rename to buildroot/support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5
diff --git a/software/support/testing/tests/download/git-remote/repo.git/refs/heads/master b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/master
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/refs/heads/master
rename to buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/master
diff --git a/software/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch
rename to buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch
diff --git a/software/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule
rename to buildroot/support/testing/tests/download/git-remote/repo.git/refs/heads/submodule
diff --git a/software/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag b/buildroot/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag
similarity index 100%
rename from software/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag
rename to buildroot/support/testing/tests/download/git-remote/repo.git/refs/tags/mytag
diff --git a/software/support/testing/tests/download/gitremote.py b/buildroot/support/testing/tests/download/gitremote.py
similarity index 100%
rename from software/support/testing/tests/download/gitremote.py
rename to buildroot/support/testing/tests/download/gitremote.py
diff --git a/software/support/testing/tests/download/test_git.py b/buildroot/support/testing/tests/download/test_git.py
similarity index 100%
rename from software/support/testing/tests/download/test_git.py
rename to buildroot/support/testing/tests/download/test_git.py
diff --git a/software/support/testing/tests/fs/__init__.py b/buildroot/support/testing/tests/fs/__init__.py
similarity index 100%
rename from software/support/testing/tests/fs/__init__.py
rename to buildroot/support/testing/tests/fs/__init__.py
diff --git a/software/support/testing/tests/fs/test_ext.py b/buildroot/support/testing/tests/fs/test_ext.py
similarity index 100%
rename from software/support/testing/tests/fs/test_ext.py
rename to buildroot/support/testing/tests/fs/test_ext.py
diff --git a/software/support/testing/tests/fs/test_f2fs.py b/buildroot/support/testing/tests/fs/test_f2fs.py
similarity index 100%
rename from software/support/testing/tests/fs/test_f2fs.py
rename to buildroot/support/testing/tests/fs/test_f2fs.py
diff --git a/software/support/testing/tests/fs/test_iso9660.py b/buildroot/support/testing/tests/fs/test_iso9660.py
similarity index 100%
rename from software/support/testing/tests/fs/test_iso9660.py
rename to buildroot/support/testing/tests/fs/test_iso9660.py
diff --git a/software/support/testing/tests/fs/test_jffs2.py b/buildroot/support/testing/tests/fs/test_jffs2.py
similarity index 100%
rename from software/support/testing/tests/fs/test_jffs2.py
rename to buildroot/support/testing/tests/fs/test_jffs2.py
diff --git a/software/support/testing/tests/fs/test_squashfs.py b/buildroot/support/testing/tests/fs/test_squashfs.py
similarity index 100%
rename from software/support/testing/tests/fs/test_squashfs.py
rename to buildroot/support/testing/tests/fs/test_squashfs.py
diff --git a/software/support/testing/tests/fs/test_ubi.py b/buildroot/support/testing/tests/fs/test_ubi.py
similarity index 100%
rename from software/support/testing/tests/fs/test_ubi.py
rename to buildroot/support/testing/tests/fs/test_ubi.py
diff --git a/software/support/testing/tests/fs/test_yaffs2.py b/buildroot/support/testing/tests/fs/test_yaffs2.py
similarity index 100%
rename from software/support/testing/tests/fs/test_yaffs2.py
rename to buildroot/support/testing/tests/fs/test_yaffs2.py
diff --git a/software/support/testing/tests/init/__init__.py b/buildroot/support/testing/tests/init/__init__.py
similarity index 100%
rename from software/support/testing/tests/init/__init__.py
rename to buildroot/support/testing/tests/init/__init__.py
diff --git a/software/support/testing/tests/init/base.py b/buildroot/support/testing/tests/init/base.py
similarity index 100%
rename from software/support/testing/tests/init/base.py
rename to buildroot/support/testing/tests/init/base.py
diff --git a/software/support/testing/tests/init/systemd-factory/var/foo/bar b/buildroot/support/testing/tests/init/systemd-factory/var/foo/bar
similarity index 100%
rename from software/support/testing/tests/init/systemd-factory/var/foo/bar
rename to buildroot/support/testing/tests/init/systemd-factory/var/foo/bar
diff --git a/software/support/testing/tests/init/test_busybox.py b/buildroot/support/testing/tests/init/test_busybox.py
similarity index 100%
rename from software/support/testing/tests/init/test_busybox.py
rename to buildroot/support/testing/tests/init/test_busybox.py
diff --git a/software/support/testing/tests/init/test_none.py b/buildroot/support/testing/tests/init/test_none.py
similarity index 100%
rename from software/support/testing/tests/init/test_none.py
rename to buildroot/support/testing/tests/init/test_none.py
diff --git a/software/support/testing/tests/init/test_systemd.py b/buildroot/support/testing/tests/init/test_systemd.py
similarity index 100%
rename from software/support/testing/tests/init/test_systemd.py
rename to buildroot/support/testing/tests/init/test_systemd.py
diff --git a/software/support/testing/tests/package/__init__.py b/buildroot/support/testing/tests/package/__init__.py
similarity index 100%
rename from software/support/testing/tests/package/__init__.py
rename to buildroot/support/testing/tests/package/__init__.py
diff --git a/software/support/testing/tests/package/br2-external/openjdk/Config.in b/buildroot/support/testing/tests/package/br2-external/openjdk/Config.in
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/Config.in
rename to buildroot/support/testing/tests/package/br2-external/openjdk/Config.in
diff --git a/software/support/testing/tests/package/br2-external/openjdk/external.desc b/buildroot/support/testing/tests/package/br2-external/openjdk/external.desc
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/external.desc
rename to buildroot/support/testing/tests/package/br2-external/openjdk/external.desc
diff --git a/software/support/testing/tests/package/br2-external/openjdk/external.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/external.mk
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/external.mk
rename to buildroot/support/testing/tests/package/br2-external/openjdk/external.mk
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h
diff --git a/software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk
similarity index 100%
rename from software/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk
rename to buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk
diff --git a/software/support/testing/tests/package/copy-sample-script-to-target.sh b/buildroot/support/testing/tests/package/copy-sample-script-to-target.sh
similarity index 100%
rename from software/support/testing/tests/package/copy-sample-script-to-target.sh
rename to buildroot/support/testing/tests/package/copy-sample-script-to-target.sh
diff --git a/software/support/testing/tests/package/sample_libftdi1.py b/buildroot/support/testing/tests/package/sample_libftdi1.py
similarity index 100%
rename from software/support/testing/tests/package/sample_libftdi1.py
rename to buildroot/support/testing/tests/package/sample_libftdi1.py
diff --git a/software/support/testing/tests/package/sample_python_argh.py b/buildroot/support/testing/tests/package/sample_python_argh.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_argh.py
rename to buildroot/support/testing/tests/package/sample_python_argh.py
diff --git a/software/support/testing/tests/package/sample_python_attrs.py b/buildroot/support/testing/tests/package/sample_python_attrs.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_attrs.py
rename to buildroot/support/testing/tests/package/sample_python_attrs.py
diff --git a/software/support/testing/tests/package/sample_python_autobahn.py b/buildroot/support/testing/tests/package/sample_python_autobahn.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_autobahn.py
rename to buildroot/support/testing/tests/package/sample_python_autobahn.py
diff --git a/software/support/testing/tests/package/sample_python_automat.py b/buildroot/support/testing/tests/package/sample_python_automat.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_automat.py
rename to buildroot/support/testing/tests/package/sample_python_automat.py
diff --git a/software/support/testing/tests/package/sample_python_avro.py b/buildroot/support/testing/tests/package/sample_python_avro.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_avro.py
rename to buildroot/support/testing/tests/package/sample_python_avro.py
diff --git a/software/support/testing/tests/package/sample_python_bitstring.py b/buildroot/support/testing/tests/package/sample_python_bitstring.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_bitstring.py
rename to buildroot/support/testing/tests/package/sample_python_bitstring.py
diff --git a/software/support/testing/tests/package/sample_python_can.py b/buildroot/support/testing/tests/package/sample_python_can.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_can.py
rename to buildroot/support/testing/tests/package/sample_python_can.py
diff --git a/software/support/testing/tests/package/sample_python_cbor_dec.py b/buildroot/support/testing/tests/package/sample_python_cbor_dec.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_cbor_dec.py
rename to buildroot/support/testing/tests/package/sample_python_cbor_dec.py
diff --git a/software/support/testing/tests/package/sample_python_cbor_enc.py b/buildroot/support/testing/tests/package/sample_python_cbor_enc.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_cbor_enc.py
rename to buildroot/support/testing/tests/package/sample_python_cbor_enc.py
diff --git a/software/support/testing/tests/package/sample_python_click.py b/buildroot/support/testing/tests/package/sample_python_click.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_click.py
rename to buildroot/support/testing/tests/package/sample_python_click.py
diff --git a/software/support/testing/tests/package/sample_python_constantly.py b/buildroot/support/testing/tests/package/sample_python_constantly.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_constantly.py
rename to buildroot/support/testing/tests/package/sample_python_constantly.py
diff --git a/software/support/testing/tests/package/sample_python_crossbar.py b/buildroot/support/testing/tests/package/sample_python_crossbar.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_crossbar.py
rename to buildroot/support/testing/tests/package/sample_python_crossbar.py
diff --git a/software/support/testing/tests/package/sample_python_cryptography.py b/buildroot/support/testing/tests/package/sample_python_cryptography.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_cryptography.py
rename to buildroot/support/testing/tests/package/sample_python_cryptography.py
diff --git a/software/support/testing/tests/package/sample_python_django.py b/buildroot/support/testing/tests/package/sample_python_django.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_django.py
rename to buildroot/support/testing/tests/package/sample_python_django.py
diff --git a/software/support/testing/tests/package/sample_python_gitdb2.py b/buildroot/support/testing/tests/package/sample_python_gitdb2.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_gitdb2.py
rename to buildroot/support/testing/tests/package/sample_python_gitdb2.py
diff --git a/software/support/testing/tests/package/sample_python_gobject.py b/buildroot/support/testing/tests/package/sample_python_gobject.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_gobject.py
rename to buildroot/support/testing/tests/package/sample_python_gobject.py
diff --git a/software/support/testing/tests/package/sample_python_incremental.py b/buildroot/support/testing/tests/package/sample_python_incremental.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_incremental.py
rename to buildroot/support/testing/tests/package/sample_python_incremental.py
diff --git a/software/support/testing/tests/package/sample_python_passlib.py b/buildroot/support/testing/tests/package/sample_python_passlib.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_passlib.py
rename to buildroot/support/testing/tests/package/sample_python_passlib.py
diff --git a/software/support/testing/tests/package/sample_python_pexpect.py b/buildroot/support/testing/tests/package/sample_python_pexpect.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_pexpect.py
rename to buildroot/support/testing/tests/package/sample_python_pexpect.py
diff --git a/software/support/testing/tests/package/sample_python_pynacl.py b/buildroot/support/testing/tests/package/sample_python_pynacl.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_pynacl.py
rename to buildroot/support/testing/tests/package/sample_python_pynacl.py
diff --git a/software/support/testing/tests/package/sample_python_pyyaml_dec.py b/buildroot/support/testing/tests/package/sample_python_pyyaml_dec.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_pyyaml_dec.py
rename to buildroot/support/testing/tests/package/sample_python_pyyaml_dec.py
diff --git a/software/support/testing/tests/package/sample_python_pyyaml_enc.py b/buildroot/support/testing/tests/package/sample_python_pyyaml_enc.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_pyyaml_enc.py
rename to buildroot/support/testing/tests/package/sample_python_pyyaml_enc.py
diff --git a/software/support/testing/tests/package/sample_python_service_identity.py b/buildroot/support/testing/tests/package/sample_python_service_identity.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_service_identity.py
rename to buildroot/support/testing/tests/package/sample_python_service_identity.py
diff --git a/software/support/testing/tests/package/sample_python_smmap2.py b/buildroot/support/testing/tests/package/sample_python_smmap2.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_smmap2.py
rename to buildroot/support/testing/tests/package/sample_python_smmap2.py
diff --git a/software/support/testing/tests/package/sample_python_subprocess32.py b/buildroot/support/testing/tests/package/sample_python_subprocess32.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_subprocess32.py
rename to buildroot/support/testing/tests/package/sample_python_subprocess32.py
diff --git a/software/support/testing/tests/package/sample_python_treq.py b/buildroot/support/testing/tests/package/sample_python_treq.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_treq.py
rename to buildroot/support/testing/tests/package/sample_python_treq.py
diff --git a/software/support/testing/tests/package/sample_python_twisted.py b/buildroot/support/testing/tests/package/sample_python_twisted.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_twisted.py
rename to buildroot/support/testing/tests/package/sample_python_twisted.py
diff --git a/software/support/testing/tests/package/sample_python_txaio_asyncio.py b/buildroot/support/testing/tests/package/sample_python_txaio_asyncio.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_txaio_asyncio.py
rename to buildroot/support/testing/tests/package/sample_python_txaio_asyncio.py
diff --git a/software/support/testing/tests/package/sample_python_txaio_twisted.py b/buildroot/support/testing/tests/package/sample_python_txaio_twisted.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_txaio_twisted.py
rename to buildroot/support/testing/tests/package/sample_python_txaio_twisted.py
diff --git a/software/support/testing/tests/package/sample_python_txtorcon.py b/buildroot/support/testing/tests/package/sample_python_txtorcon.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_txtorcon.py
rename to buildroot/support/testing/tests/package/sample_python_txtorcon.py
diff --git a/software/support/testing/tests/package/sample_python_ubjson_dec.py b/buildroot/support/testing/tests/package/sample_python_ubjson_dec.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_ubjson_dec.py
rename to buildroot/support/testing/tests/package/sample_python_ubjson_dec.py
diff --git a/software/support/testing/tests/package/sample_python_ubjson_enc.py b/buildroot/support/testing/tests/package/sample_python_ubjson_enc.py
similarity index 100%
rename from software/support/testing/tests/package/sample_python_ubjson_enc.py
rename to buildroot/support/testing/tests/package/sample_python_ubjson_enc.py
diff --git a/software/support/testing/tests/package/test_atop.py b/buildroot/support/testing/tests/package/test_atop.py
similarity index 100%
rename from software/support/testing/tests/package/test_atop.py
rename to buildroot/support/testing/tests/package/test_atop.py
diff --git a/software/support/testing/tests/package/test_crudini.py b/buildroot/support/testing/tests/package/test_crudini.py
similarity index 100%
rename from software/support/testing/tests/package/test_crudini.py
rename to buildroot/support/testing/tests/package/test_crudini.py
diff --git a/software/support/testing/tests/package/test_docker_compose.py b/buildroot/support/testing/tests/package/test_docker_compose.py
similarity index 100%
rename from software/support/testing/tests/package/test_docker_compose.py
rename to buildroot/support/testing/tests/package/test_docker_compose.py
diff --git a/software/support/testing/tests/package/test_dropbear.py b/buildroot/support/testing/tests/package/test_dropbear.py
similarity index 100%
rename from software/support/testing/tests/package/test_dropbear.py
rename to buildroot/support/testing/tests/package/test_dropbear.py
diff --git a/software/support/testing/tests/package/test_glxinfo.py b/buildroot/support/testing/tests/package/test_glxinfo.py
similarity index 100%
rename from software/support/testing/tests/package/test_glxinfo.py
rename to buildroot/support/testing/tests/package/test_glxinfo.py
diff --git a/software/support/testing/tests/package/test_ipython.py b/buildroot/support/testing/tests/package/test_ipython.py
similarity index 100%
rename from software/support/testing/tests/package/test_ipython.py
rename to buildroot/support/testing/tests/package/test_ipython.py
diff --git a/software/support/testing/tests/package/test_libftdi1.py b/buildroot/support/testing/tests/package/test_libftdi1.py
similarity index 100%
rename from software/support/testing/tests/package/test_libftdi1.py
rename to buildroot/support/testing/tests/package/test_libftdi1.py
diff --git a/software/support/testing/tests/package/test_lpeg.py b/buildroot/support/testing/tests/package/test_lpeg.py
similarity index 100%
rename from software/support/testing/tests/package/test_lpeg.py
rename to buildroot/support/testing/tests/package/test_lpeg.py
diff --git a/software/support/testing/tests/package/test_lsqlite3.py b/buildroot/support/testing/tests/package/test_lsqlite3.py
similarity index 100%
rename from software/support/testing/tests/package/test_lsqlite3.py
rename to buildroot/support/testing/tests/package/test_lsqlite3.py
diff --git a/software/support/testing/tests/package/test_lua.py b/buildroot/support/testing/tests/package/test_lua.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua.py
rename to buildroot/support/testing/tests/package/test_lua.py
diff --git a/software/support/testing/tests/package/test_lua_cqueues.py b/buildroot/support/testing/tests/package/test_lua_cqueues.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua_cqueues.py
rename to buildroot/support/testing/tests/package/test_lua_cqueues.py
diff --git a/software/support/testing/tests/package/test_lua_curl.py b/buildroot/support/testing/tests/package/test_lua_curl.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua_curl.py
rename to buildroot/support/testing/tests/package/test_lua_curl.py
diff --git a/software/support/testing/tests/package/test_lua_gd.py b/buildroot/support/testing/tests/package/test_lua_gd.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua_gd.py
rename to buildroot/support/testing/tests/package/test_lua_gd.py
diff --git a/software/support/testing/tests/package/test_lua_http.py b/buildroot/support/testing/tests/package/test_lua_http.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua_http.py
rename to buildroot/support/testing/tests/package/test_lua_http.py
diff --git a/software/support/testing/tests/package/test_lua_sdl2.py b/buildroot/support/testing/tests/package/test_lua_sdl2.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua_sdl2.py
rename to buildroot/support/testing/tests/package/test_lua_sdl2.py
diff --git a/software/support/testing/tests/package/test_lua_utf8.py b/buildroot/support/testing/tests/package/test_lua_utf8.py
similarity index 100%
rename from software/support/testing/tests/package/test_lua_utf8.py
rename to buildroot/support/testing/tests/package/test_lua_utf8.py
diff --git a/software/support/testing/tests/package/test_luaexpat.py b/buildroot/support/testing/tests/package/test_luaexpat.py
similarity index 100%
rename from software/support/testing/tests/package/test_luaexpat.py
rename to buildroot/support/testing/tests/package/test_luaexpat.py
diff --git a/software/support/testing/tests/package/test_luafilesystem.py b/buildroot/support/testing/tests/package/test_luafilesystem.py
similarity index 100%
rename from software/support/testing/tests/package/test_luafilesystem.py
rename to buildroot/support/testing/tests/package/test_luafilesystem.py
diff --git a/software/support/testing/tests/package/test_luaossl.py b/buildroot/support/testing/tests/package/test_luaossl.py
similarity index 100%
rename from software/support/testing/tests/package/test_luaossl.py
rename to buildroot/support/testing/tests/package/test_luaossl.py
diff --git a/software/support/testing/tests/package/test_luaposix.py b/buildroot/support/testing/tests/package/test_luaposix.py
similarity index 100%
rename from software/support/testing/tests/package/test_luaposix.py
rename to buildroot/support/testing/tests/package/test_luaposix.py
diff --git a/software/support/testing/tests/package/test_luasec.py b/buildroot/support/testing/tests/package/test_luasec.py
similarity index 100%
rename from software/support/testing/tests/package/test_luasec.py
rename to buildroot/support/testing/tests/package/test_luasec.py
diff --git a/software/support/testing/tests/package/test_luasocket.py b/buildroot/support/testing/tests/package/test_luasocket.py
similarity index 100%
rename from software/support/testing/tests/package/test_luasocket.py
rename to buildroot/support/testing/tests/package/test_luasocket.py
diff --git a/software/support/testing/tests/package/test_luasyslog.py b/buildroot/support/testing/tests/package/test_luasyslog.py
similarity index 100%
rename from software/support/testing/tests/package/test_luasyslog.py
rename to buildroot/support/testing/tests/package/test_luasyslog.py
diff --git a/software/support/testing/tests/package/test_luvi.py b/buildroot/support/testing/tests/package/test_luvi.py
similarity index 100%
rename from software/support/testing/tests/package/test_luvi.py
rename to buildroot/support/testing/tests/package/test_luvi.py
diff --git a/software/support/testing/tests/package/test_lxc.py b/buildroot/support/testing/tests/package/test_lxc.py
similarity index 100%
rename from software/support/testing/tests/package/test_lxc.py
rename to buildroot/support/testing/tests/package/test_lxc.py
diff --git a/software/support/testing/tests/package/test_lxc/lxc-kernel.config b/buildroot/support/testing/tests/package/test_lxc/lxc-kernel.config
similarity index 100%
rename from software/support/testing/tests/package/test_lxc/lxc-kernel.config
rename to buildroot/support/testing/tests/package/test_lxc/lxc-kernel.config
diff --git a/software/support/testing/tests/package/test_lxc/rootfs-overlay/usr/bin/iperf3.sh b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/bin/iperf3.sh
similarity index 100%
rename from software/support/testing/tests/package/test_lxc/rootfs-overlay/usr/bin/iperf3.sh
rename to buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/bin/iperf3.sh
diff --git a/software/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf
similarity index 100%
rename from software/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf
rename to buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf
diff --git a/software/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf
similarity index 100%
rename from software/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf
rename to buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf
diff --git a/software/support/testing/tests/package/test_lzlib.py b/buildroot/support/testing/tests/package/test_lzlib.py
similarity index 100%
rename from software/support/testing/tests/package/test_lzlib.py
rename to buildroot/support/testing/tests/package/test_lzlib.py
diff --git a/software/support/testing/tests/package/test_openjdk.py b/buildroot/support/testing/tests/package/test_openjdk.py
similarity index 100%
rename from software/support/testing/tests/package/test_openjdk.py
rename to buildroot/support/testing/tests/package/test_openjdk.py
diff --git a/software/support/testing/tests/package/test_opkg.py b/buildroot/support/testing/tests/package/test_opkg.py
similarity index 100%
rename from software/support/testing/tests/package/test_opkg.py
rename to buildroot/support/testing/tests/package/test_opkg.py
diff --git a/software/support/testing/tests/package/test_opkg/post-build.sh b/buildroot/support/testing/tests/package/test_opkg/post-build.sh
similarity index 100%
rename from software/support/testing/tests/package/test_opkg/post-build.sh
rename to buildroot/support/testing/tests/package/test_opkg/post-build.sh
diff --git a/software/support/testing/tests/package/test_perl.py b/buildroot/support/testing/tests/package/test_perl.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl.py
rename to buildroot/support/testing/tests/package/test_perl.py
diff --git a/software/support/testing/tests/package/test_perl_class_load.py b/buildroot/support/testing/tests/package/test_perl_class_load.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_class_load.py
rename to buildroot/support/testing/tests/package/test_perl_class_load.py
diff --git a/software/support/testing/tests/package/test_perl_dbd_mysql.py b/buildroot/support/testing/tests/package/test_perl_dbd_mysql.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_dbd_mysql.py
rename to buildroot/support/testing/tests/package/test_perl_dbd_mysql.py
diff --git a/software/support/testing/tests/package/test_perl_encode_detect.py b/buildroot/support/testing/tests/package/test_perl_encode_detect.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_encode_detect.py
rename to buildroot/support/testing/tests/package/test_perl_encode_detect.py
diff --git a/software/support/testing/tests/package/test_perl_gdgraph.py b/buildroot/support/testing/tests/package/test_perl_gdgraph.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_gdgraph.py
rename to buildroot/support/testing/tests/package/test_perl_gdgraph.py
diff --git a/software/support/testing/tests/package/test_perl_io_socket_multicast.py b/buildroot/support/testing/tests/package/test_perl_io_socket_multicast.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_io_socket_multicast.py
rename to buildroot/support/testing/tests/package/test_perl_io_socket_multicast.py
diff --git a/software/support/testing/tests/package/test_perl_io_socket_ssl.py b/buildroot/support/testing/tests/package/test_perl_io_socket_ssl.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_io_socket_ssl.py
rename to buildroot/support/testing/tests/package/test_perl_io_socket_ssl.py
diff --git a/software/support/testing/tests/package/test_perl_libwww_perl.py b/buildroot/support/testing/tests/package/test_perl_libwww_perl.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_libwww_perl.py
rename to buildroot/support/testing/tests/package/test_perl_libwww_perl.py
diff --git a/software/support/testing/tests/package/test_perl_mail_dkim.py b/buildroot/support/testing/tests/package/test_perl_mail_dkim.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_mail_dkim.py
rename to buildroot/support/testing/tests/package/test_perl_mail_dkim.py
diff --git a/software/support/testing/tests/package/test_perl_x10.py b/buildroot/support/testing/tests/package/test_perl_x10.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_x10.py
rename to buildroot/support/testing/tests/package/test_perl_x10.py
diff --git a/software/support/testing/tests/package/test_perl_xml_libxml.py b/buildroot/support/testing/tests/package/test_perl_xml_libxml.py
similarity index 100%
rename from software/support/testing/tests/package/test_perl_xml_libxml.py
rename to buildroot/support/testing/tests/package/test_perl_xml_libxml.py
diff --git a/software/support/testing/tests/package/test_prosody.py b/buildroot/support/testing/tests/package/test_prosody.py
similarity index 100%
rename from software/support/testing/tests/package/test_prosody.py
rename to buildroot/support/testing/tests/package/test_prosody.py
diff --git a/software/support/testing/tests/package/test_python.py b/buildroot/support/testing/tests/package/test_python.py
similarity index 100%
rename from software/support/testing/tests/package/test_python.py
rename to buildroot/support/testing/tests/package/test_python.py
diff --git a/software/support/testing/tests/package/test_python_argh.py b/buildroot/support/testing/tests/package/test_python_argh.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_argh.py
rename to buildroot/support/testing/tests/package/test_python_argh.py
diff --git a/software/support/testing/tests/package/test_python_attrs.py b/buildroot/support/testing/tests/package/test_python_attrs.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_attrs.py
rename to buildroot/support/testing/tests/package/test_python_attrs.py
diff --git a/software/support/testing/tests/package/test_python_autobahn.py b/buildroot/support/testing/tests/package/test_python_autobahn.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_autobahn.py
rename to buildroot/support/testing/tests/package/test_python_autobahn.py
diff --git a/software/support/testing/tests/package/test_python_automat.py b/buildroot/support/testing/tests/package/test_python_automat.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_automat.py
rename to buildroot/support/testing/tests/package/test_python_automat.py
diff --git a/software/support/testing/tests/package/test_python_avro.py b/buildroot/support/testing/tests/package/test_python_avro.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_avro.py
rename to buildroot/support/testing/tests/package/test_python_avro.py
diff --git a/software/support/testing/tests/package/test_python_bitstring.py b/buildroot/support/testing/tests/package/test_python_bitstring.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_bitstring.py
rename to buildroot/support/testing/tests/package/test_python_bitstring.py
diff --git a/software/support/testing/tests/package/test_python_can.py b/buildroot/support/testing/tests/package/test_python_can.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_can.py
rename to buildroot/support/testing/tests/package/test_python_can.py
diff --git a/software/support/testing/tests/package/test_python_cbor.py b/buildroot/support/testing/tests/package/test_python_cbor.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_cbor.py
rename to buildroot/support/testing/tests/package/test_python_cbor.py
diff --git a/software/support/testing/tests/package/test_python_click.py b/buildroot/support/testing/tests/package/test_python_click.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_click.py
rename to buildroot/support/testing/tests/package/test_python_click.py
diff --git a/software/support/testing/tests/package/test_python_constantly.py b/buildroot/support/testing/tests/package/test_python_constantly.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_constantly.py
rename to buildroot/support/testing/tests/package/test_python_constantly.py
diff --git a/software/support/testing/tests/package/test_python_crossbar.py b/buildroot/support/testing/tests/package/test_python_crossbar.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_crossbar.py
rename to buildroot/support/testing/tests/package/test_python_crossbar.py
diff --git a/software/support/testing/tests/package/test_python_cryptography.py b/buildroot/support/testing/tests/package/test_python_cryptography.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_cryptography.py
rename to buildroot/support/testing/tests/package/test_python_cryptography.py
diff --git a/software/support/testing/tests/package/test_python_django.py b/buildroot/support/testing/tests/package/test_python_django.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_django.py
rename to buildroot/support/testing/tests/package/test_python_django.py
diff --git a/software/support/testing/tests/package/test_python_gitdb2.py b/buildroot/support/testing/tests/package/test_python_gitdb2.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_gitdb2.py
rename to buildroot/support/testing/tests/package/test_python_gitdb2.py
diff --git a/software/support/testing/tests/package/test_python_gobject.py b/buildroot/support/testing/tests/package/test_python_gobject.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_gobject.py
rename to buildroot/support/testing/tests/package/test_python_gobject.py
diff --git a/software/support/testing/tests/package/test_python_incremental.py b/buildroot/support/testing/tests/package/test_python_incremental.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_incremental.py
rename to buildroot/support/testing/tests/package/test_python_incremental.py
diff --git a/software/support/testing/tests/package/test_python_passlib.py b/buildroot/support/testing/tests/package/test_python_passlib.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_passlib.py
rename to buildroot/support/testing/tests/package/test_python_passlib.py
diff --git a/software/support/testing/tests/package/test_python_pexpect.py b/buildroot/support/testing/tests/package/test_python_pexpect.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_pexpect.py
rename to buildroot/support/testing/tests/package/test_python_pexpect.py
diff --git a/software/support/testing/tests/package/test_python_pynacl.py b/buildroot/support/testing/tests/package/test_python_pynacl.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_pynacl.py
rename to buildroot/support/testing/tests/package/test_python_pynacl.py
diff --git a/software/support/testing/tests/package/test_python_pyyaml.py b/buildroot/support/testing/tests/package/test_python_pyyaml.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_pyyaml.py
rename to buildroot/support/testing/tests/package/test_python_pyyaml.py
diff --git a/software/support/testing/tests/package/test_python_service_identity.py b/buildroot/support/testing/tests/package/test_python_service_identity.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_service_identity.py
rename to buildroot/support/testing/tests/package/test_python_service_identity.py
diff --git a/software/support/testing/tests/package/test_python_smmap2.py b/buildroot/support/testing/tests/package/test_python_smmap2.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_smmap2.py
rename to buildroot/support/testing/tests/package/test_python_smmap2.py
diff --git a/software/support/testing/tests/package/test_python_subprocess32.py b/buildroot/support/testing/tests/package/test_python_subprocess32.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_subprocess32.py
rename to buildroot/support/testing/tests/package/test_python_subprocess32.py
diff --git a/software/support/testing/tests/package/test_python_treq.py b/buildroot/support/testing/tests/package/test_python_treq.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_treq.py
rename to buildroot/support/testing/tests/package/test_python_treq.py
diff --git a/software/support/testing/tests/package/test_python_twisted.py b/buildroot/support/testing/tests/package/test_python_twisted.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_twisted.py
rename to buildroot/support/testing/tests/package/test_python_twisted.py
diff --git a/software/support/testing/tests/package/test_python_txaio.py b/buildroot/support/testing/tests/package/test_python_txaio.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_txaio.py
rename to buildroot/support/testing/tests/package/test_python_txaio.py
diff --git a/software/support/testing/tests/package/test_python_txtorcon.py b/buildroot/support/testing/tests/package/test_python_txtorcon.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_txtorcon.py
rename to buildroot/support/testing/tests/package/test_python_txtorcon.py
diff --git a/software/support/testing/tests/package/test_python_ubjson.py b/buildroot/support/testing/tests/package/test_python_ubjson.py
similarity index 100%
rename from software/support/testing/tests/package/test_python_ubjson.py
rename to buildroot/support/testing/tests/package/test_python_ubjson.py
diff --git a/software/support/testing/tests/package/test_rings.py b/buildroot/support/testing/tests/package/test_rings.py
similarity index 100%
rename from software/support/testing/tests/package/test_rings.py
rename to buildroot/support/testing/tests/package/test_rings.py
diff --git a/software/support/testing/tests/package/test_rust.py b/buildroot/support/testing/tests/package/test_rust.py
similarity index 100%
rename from software/support/testing/tests/package/test_rust.py
rename to buildroot/support/testing/tests/package/test_rust.py
diff --git a/software/support/testing/tests/package/test_syslog_ng.py b/buildroot/support/testing/tests/package/test_syslog_ng.py
similarity index 100%
rename from software/support/testing/tests/package/test_syslog_ng.py
rename to buildroot/support/testing/tests/package/test_syslog_ng.py
diff --git a/software/support/testing/tests/package/test_tmux.py b/buildroot/support/testing/tests/package/test_tmux.py
similarity index 100%
rename from software/support/testing/tests/package/test_tmux.py
rename to buildroot/support/testing/tests/package/test_tmux.py
diff --git a/software/support/testing/tests/package/test_turbolua.py b/buildroot/support/testing/tests/package/test_turbolua.py
similarity index 100%
rename from software/support/testing/tests/package/test_turbolua.py
rename to buildroot/support/testing/tests/package/test_turbolua.py
diff --git a/software/support/testing/tests/toolchain/__init__.py b/buildroot/support/testing/tests/toolchain/__init__.py
similarity index 100%
rename from software/support/testing/tests/toolchain/__init__.py
rename to buildroot/support/testing/tests/toolchain/__init__.py
diff --git a/software/support/testing/tests/toolchain/test_external.py b/buildroot/support/testing/tests/toolchain/test_external.py
similarity index 100%
rename from software/support/testing/tests/toolchain/test_external.py
rename to buildroot/support/testing/tests/toolchain/test_external.py
diff --git a/software/support/testing/tests/utils/__init__.py b/buildroot/support/testing/tests/utils/__init__.py
similarity index 100%
rename from software/support/testing/tests/utils/__init__.py
rename to buildroot/support/testing/tests/utils/__init__.py
diff --git a/software/support/testing/tests/utils/br2-external/Config.in b/buildroot/support/testing/tests/utils/br2-external/Config.in
similarity index 100%
rename from software/support/testing/tests/utils/br2-external/Config.in
rename to buildroot/support/testing/tests/utils/br2-external/Config.in
diff --git a/software/support/testing/tests/utils/br2-external/external.desc b/buildroot/support/testing/tests/utils/br2-external/external.desc
similarity index 100%
rename from software/support/testing/tests/utils/br2-external/external.desc
rename to buildroot/support/testing/tests/utils/br2-external/external.desc
diff --git a/software/support/testing/tests/utils/br2-external/external.mk b/buildroot/support/testing/tests/utils/br2-external/external.mk
similarity index 100%
rename from software/support/testing/tests/utils/br2-external/external.mk
rename to buildroot/support/testing/tests/utils/br2-external/external.mk
diff --git a/software/support/testing/tests/utils/br2-external/package/external/external.mk b/buildroot/support/testing/tests/utils/br2-external/package/external/external.mk
similarity index 100%
rename from software/support/testing/tests/utils/br2-external/package/external/external.mk
rename to buildroot/support/testing/tests/utils/br2-external/package/external/external.mk
diff --git a/software/support/testing/tests/utils/test_check_package.py b/buildroot/support/testing/tests/utils/test_check_package.py
similarity index 100%
rename from software/support/testing/tests/utils/test_check_package.py
rename to buildroot/support/testing/tests/utils/test_check_package.py
diff --git a/software/system/Config.in b/buildroot/system/Config.in
similarity index 100%
rename from software/system/Config.in
rename to buildroot/system/Config.in
diff --git a/software/system/device_table.txt b/buildroot/system/device_table.txt
similarity index 100%
rename from software/system/device_table.txt
rename to buildroot/system/device_table.txt
diff --git a/software/system/device_table_dev.txt b/buildroot/system/device_table_dev.txt
similarity index 100%
rename from software/system/device_table_dev.txt
rename to buildroot/system/device_table_dev.txt
diff --git a/software/system/skeleton/dev/.empty b/buildroot/system/skeleton/dev/.empty
similarity index 100%
rename from software/system/skeleton/dev/.empty
rename to buildroot/system/skeleton/dev/.empty
diff --git a/software/system/skeleton/dev/fd b/buildroot/system/skeleton/dev/fd
similarity index 100%
rename from software/system/skeleton/dev/fd
rename to buildroot/system/skeleton/dev/fd
diff --git a/software/system/skeleton/dev/stderr b/buildroot/system/skeleton/dev/stderr
similarity index 100%
rename from software/system/skeleton/dev/stderr
rename to buildroot/system/skeleton/dev/stderr
diff --git a/software/system/skeleton/dev/stdin b/buildroot/system/skeleton/dev/stdin
similarity index 100%
rename from software/system/skeleton/dev/stdin
rename to buildroot/system/skeleton/dev/stdin
diff --git a/software/system/skeleton/dev/stdout b/buildroot/system/skeleton/dev/stdout
similarity index 100%
rename from software/system/skeleton/dev/stdout
rename to buildroot/system/skeleton/dev/stdout
diff --git a/software/system/skeleton/etc/group b/buildroot/system/skeleton/etc/group
similarity index 100%
rename from software/system/skeleton/etc/group
rename to buildroot/system/skeleton/etc/group
diff --git a/software/system/skeleton/etc/hosts b/buildroot/system/skeleton/etc/hosts
similarity index 100%
rename from software/system/skeleton/etc/hosts
rename to buildroot/system/skeleton/etc/hosts
diff --git a/software/system/skeleton/etc/mtab b/buildroot/system/skeleton/etc/mtab
similarity index 100%
rename from software/system/skeleton/etc/mtab
rename to buildroot/system/skeleton/etc/mtab
diff --git a/software/system/skeleton/etc/passwd b/buildroot/system/skeleton/etc/passwd
similarity index 100%
rename from software/system/skeleton/etc/passwd
rename to buildroot/system/skeleton/etc/passwd
diff --git a/software/system/skeleton/etc/profile b/buildroot/system/skeleton/etc/profile
similarity index 100%
rename from software/system/skeleton/etc/profile
rename to buildroot/system/skeleton/etc/profile
diff --git a/software/system/skeleton/etc/profile.d/umask.sh b/buildroot/system/skeleton/etc/profile.d/umask.sh
similarity index 100%
rename from software/system/skeleton/etc/profile.d/umask.sh
rename to buildroot/system/skeleton/etc/profile.d/umask.sh
diff --git a/software/system/skeleton/etc/protocols b/buildroot/system/skeleton/etc/protocols
similarity index 100%
rename from software/system/skeleton/etc/protocols
rename to buildroot/system/skeleton/etc/protocols
diff --git a/software/system/skeleton/etc/resolv.conf b/buildroot/system/skeleton/etc/resolv.conf
similarity index 100%
rename from software/system/skeleton/etc/resolv.conf
rename to buildroot/system/skeleton/etc/resolv.conf
diff --git a/software/system/skeleton/etc/services b/buildroot/system/skeleton/etc/services
similarity index 100%
rename from software/system/skeleton/etc/services
rename to buildroot/system/skeleton/etc/services
diff --git a/software/system/skeleton/etc/shadow b/buildroot/system/skeleton/etc/shadow
similarity index 100%
rename from software/system/skeleton/etc/shadow
rename to buildroot/system/skeleton/etc/shadow
diff --git a/software/system/skeleton/media/.empty b/buildroot/system/skeleton/media/.empty
similarity index 100%
rename from software/system/skeleton/media/.empty
rename to buildroot/system/skeleton/media/.empty
diff --git a/software/system/skeleton/mnt/.empty b/buildroot/system/skeleton/mnt/.empty
similarity index 100%
rename from software/system/skeleton/mnt/.empty
rename to buildroot/system/skeleton/mnt/.empty
diff --git a/software/system/skeleton/opt/.empty b/buildroot/system/skeleton/opt/.empty
similarity index 100%
rename from software/system/skeleton/opt/.empty
rename to buildroot/system/skeleton/opt/.empty
diff --git a/software/system/skeleton/proc/.empty b/buildroot/system/skeleton/proc/.empty
similarity index 100%
rename from software/system/skeleton/proc/.empty
rename to buildroot/system/skeleton/proc/.empty
diff --git a/software/system/skeleton/root/.empty b/buildroot/system/skeleton/root/.empty
similarity index 100%
rename from software/system/skeleton/root/.empty
rename to buildroot/system/skeleton/root/.empty
diff --git a/software/system/skeleton/run/.empty b/buildroot/system/skeleton/run/.empty
similarity index 100%
rename from software/system/skeleton/run/.empty
rename to buildroot/system/skeleton/run/.empty
diff --git a/software/system/skeleton/sys/.empty b/buildroot/system/skeleton/sys/.empty
similarity index 100%
rename from software/system/skeleton/sys/.empty
rename to buildroot/system/skeleton/sys/.empty
diff --git a/software/system/skeleton/tmp/.empty b/buildroot/system/skeleton/tmp/.empty
similarity index 100%
rename from software/system/skeleton/tmp/.empty
rename to buildroot/system/skeleton/tmp/.empty
diff --git a/software/system/skeleton/usr/bin/.empty b/buildroot/system/skeleton/usr/bin/.empty
similarity index 100%
rename from software/system/skeleton/usr/bin/.empty
rename to buildroot/system/skeleton/usr/bin/.empty
diff --git a/software/system/skeleton/usr/lib/.empty b/buildroot/system/skeleton/usr/lib/.empty
similarity index 100%
rename from software/system/skeleton/usr/lib/.empty
rename to buildroot/system/skeleton/usr/lib/.empty
diff --git a/software/system/skeleton/usr/sbin/.empty b/buildroot/system/skeleton/usr/sbin/.empty
similarity index 100%
rename from software/system/skeleton/usr/sbin/.empty
rename to buildroot/system/skeleton/usr/sbin/.empty
diff --git a/software/system/system.mk b/buildroot/system/system.mk
similarity index 100%
rename from software/system/system.mk
rename to buildroot/system/system.mk
diff --git a/software/toolchain/Config.in b/buildroot/toolchain/Config.in
similarity index 100%
rename from software/toolchain/Config.in
rename to buildroot/toolchain/Config.in
diff --git a/software/toolchain/helpers.mk b/buildroot/toolchain/helpers.mk
similarity index 100%
rename from software/toolchain/helpers.mk
rename to buildroot/toolchain/helpers.mk
diff --git a/software/toolchain/toolchain-buildroot/Config.in b/buildroot/toolchain/toolchain-buildroot/Config.in
similarity index 100%
rename from software/toolchain/toolchain-buildroot/Config.in
rename to buildroot/toolchain/toolchain-buildroot/Config.in
diff --git a/software/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/buildroot/toolchain/toolchain-buildroot/toolchain-buildroot.mk
similarity index 100%
rename from software/toolchain/toolchain-buildroot/toolchain-buildroot.mk
rename to buildroot/toolchain/toolchain-buildroot/toolchain-buildroot.mk
diff --git a/software/toolchain/toolchain-external/Config.in b/buildroot/toolchain/toolchain-external/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/Config.in
rename to buildroot/toolchain/toolchain-external/Config.in
diff --git a/software/toolchain/toolchain-external/pkg-toolchain-external.mk b/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
similarity index 100%
rename from software/toolchain/toolchain-external/pkg-toolchain-external.mk
rename to buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-custom/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-custom/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk b/buildroot/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in
rename to buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in
diff --git a/software/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options
rename to buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options
diff --git a/software/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash
rename to buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash
diff --git a/software/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk
diff --git a/software/toolchain/toolchain-external/toolchain-external.mk b/buildroot/toolchain/toolchain-external/toolchain-external.mk
similarity index 100%
rename from software/toolchain/toolchain-external/toolchain-external.mk
rename to buildroot/toolchain/toolchain-external/toolchain-external.mk
diff --git a/software/toolchain/toolchain-wrapper.c b/buildroot/toolchain/toolchain-wrapper.c
similarity index 100%
rename from software/toolchain/toolchain-wrapper.c
rename to buildroot/toolchain/toolchain-wrapper.c
diff --git a/software/toolchain/toolchain-wrapper.mk b/buildroot/toolchain/toolchain-wrapper.mk
similarity index 100%
rename from software/toolchain/toolchain-wrapper.mk
rename to buildroot/toolchain/toolchain-wrapper.mk
diff --git a/software/toolchain/toolchain.mk b/buildroot/toolchain/toolchain.mk
similarity index 100%
rename from software/toolchain/toolchain.mk
rename to buildroot/toolchain/toolchain.mk
diff --git a/software/toolchain/toolchain/toolchain.mk b/buildroot/toolchain/toolchain/toolchain.mk
similarity index 100%
rename from software/toolchain/toolchain/toolchain.mk
rename to buildroot/toolchain/toolchain/toolchain.mk
diff --git a/software/utils/brmake b/buildroot/utils/brmake
similarity index 100%
rename from software/utils/brmake
rename to buildroot/utils/brmake
diff --git a/software/utils/check-package b/buildroot/utils/check-package
similarity index 100%
rename from software/utils/check-package
rename to buildroot/utils/check-package
diff --git a/software/utils/checkpackagelib/__init__.py b/buildroot/utils/checkpackagelib/__init__.py
similarity index 100%
rename from software/utils/checkpackagelib/__init__.py
rename to buildroot/utils/checkpackagelib/__init__.py
diff --git a/software/utils/checkpackagelib/base.py b/buildroot/utils/checkpackagelib/base.py
similarity index 100%
rename from software/utils/checkpackagelib/base.py
rename to buildroot/utils/checkpackagelib/base.py
diff --git a/software/utils/checkpackagelib/lib.py b/buildroot/utils/checkpackagelib/lib.py
similarity index 100%
rename from software/utils/checkpackagelib/lib.py
rename to buildroot/utils/checkpackagelib/lib.py
diff --git a/software/utils/checkpackagelib/lib_config.py b/buildroot/utils/checkpackagelib/lib_config.py
similarity index 100%
rename from software/utils/checkpackagelib/lib_config.py
rename to buildroot/utils/checkpackagelib/lib_config.py
diff --git a/software/utils/checkpackagelib/lib_hash.py b/buildroot/utils/checkpackagelib/lib_hash.py
similarity index 100%
rename from software/utils/checkpackagelib/lib_hash.py
rename to buildroot/utils/checkpackagelib/lib_hash.py
diff --git a/software/utils/checkpackagelib/lib_mk.py b/buildroot/utils/checkpackagelib/lib_mk.py
similarity index 100%
rename from software/utils/checkpackagelib/lib_mk.py
rename to buildroot/utils/checkpackagelib/lib_mk.py
diff --git a/software/utils/checkpackagelib/lib_patch.py b/buildroot/utils/checkpackagelib/lib_patch.py
similarity index 100%
rename from software/utils/checkpackagelib/lib_patch.py
rename to buildroot/utils/checkpackagelib/lib_patch.py
diff --git a/software/utils/checkpackagelib/readme.txt b/buildroot/utils/checkpackagelib/readme.txt
similarity index 100%
rename from software/utils/checkpackagelib/readme.txt
rename to buildroot/utils/checkpackagelib/readme.txt
diff --git a/software/utils/config b/buildroot/utils/config
similarity index 100%
rename from software/utils/config
rename to buildroot/utils/config
diff --git a/software/utils/diffconfig b/buildroot/utils/diffconfig
similarity index 100%
rename from software/utils/diffconfig
rename to buildroot/utils/diffconfig
diff --git a/software/utils/genrandconfig b/buildroot/utils/genrandconfig
similarity index 100%
rename from software/utils/genrandconfig
rename to buildroot/utils/genrandconfig
diff --git a/software/utils/get-developers b/buildroot/utils/get-developers
similarity index 100%
rename from software/utils/get-developers
rename to buildroot/utils/get-developers
diff --git a/software/utils/getdeveloperlib.py b/buildroot/utils/getdeveloperlib.py
similarity index 100%
rename from software/utils/getdeveloperlib.py
rename to buildroot/utils/getdeveloperlib.py
diff --git a/software/utils/readme.txt b/buildroot/utils/readme.txt
similarity index 100%
rename from software/utils/readme.txt
rename to buildroot/utils/readme.txt
diff --git a/software/utils/scancpan b/buildroot/utils/scancpan
similarity index 100%
rename from software/utils/scancpan
rename to buildroot/utils/scancpan
diff --git a/software/utils/scanpypi b/buildroot/utils/scanpypi
similarity index 100%
rename from software/utils/scanpypi
rename to buildroot/utils/scanpypi
diff --git a/software/utils/size-stats-compare b/buildroot/utils/size-stats-compare
similarity index 100%
rename from software/utils/size-stats-compare
rename to buildroot/utils/size-stats-compare
diff --git a/software/utils/test-pkg b/buildroot/utils/test-pkg
similarity index 100%
rename from software/utils/test-pkg
rename to buildroot/utils/test-pkg