diff --git a/package/e2fsprogs/Makefile b/package/system/utils/e2fsprogs/Makefile
similarity index 100%
rename from package/e2fsprogs/Makefile
rename to package/system/utils/e2fsprogs/Makefile
diff --git a/package/e2fsprogs/files/e2fsck.conf b/package/system/utils/e2fsprogs/files/e2fsck.conf
similarity index 100%
rename from package/e2fsprogs/files/e2fsck.conf
rename to package/system/utils/e2fsprogs/files/e2fsck.conf
diff --git a/package/e2fsprogs/files/e2fsck.sh b/package/system/utils/e2fsprogs/files/e2fsck.sh
similarity index 100%
rename from package/e2fsprogs/files/e2fsck.sh
rename to package/system/utils/e2fsprogs/files/e2fsck.sh
diff --git a/package/e2fsprogs/patches/001-link-against-libuuid.patch b/package/system/utils/e2fsprogs/patches/001-link-against-libuuid.patch
similarity index 100%
rename from package/e2fsprogs/patches/001-link-against-libuuid.patch
rename to package/system/utils/e2fsprogs/patches/001-link-against-libuuid.patch
diff --git a/package/e2fsprogs/patches/002-no_malloc_h.patch b/package/system/utils/e2fsprogs/patches/002-no_malloc_h.patch
similarity index 100%
rename from package/e2fsprogs/patches/002-no_malloc_h.patch
rename to package/system/utils/e2fsprogs/patches/002-no_malloc_h.patch
diff --git a/package/fbtest/Makefile b/package/system/utils/fbtest/Makefile
similarity index 100%
rename from package/fbtest/Makefile
rename to package/system/utils/fbtest/Makefile
diff --git a/package/fbtest/src/Makefile b/package/system/utils/fbtest/src/Makefile
similarity index 100%
rename from package/fbtest/src/Makefile
rename to package/system/utils/fbtest/src/Makefile
diff --git a/package/fbtest/src/fbtest.c b/package/system/utils/fbtest/src/fbtest.c
similarity index 100%
rename from package/fbtest/src/fbtest.c
rename to package/system/utils/fbtest/src/fbtest.c
diff --git a/package/hostap-utils/Makefile b/package/system/utils/hostap-utils/Makefile
similarity index 100%
rename from package/hostap-utils/Makefile
rename to package/system/utils/hostap-utils/Makefile
diff --git a/package/nvram/Makefile b/package/system/utils/nvram/Makefile
similarity index 100%
rename from package/nvram/Makefile
rename to package/system/utils/nvram/Makefile
diff --git a/package/nvram/files/nvram.init b/package/system/utils/nvram/files/nvram.init
similarity index 100%
rename from package/nvram/files/nvram.init
rename to package/system/utils/nvram/files/nvram.init
diff --git a/package/nvram/src/Makefile b/package/system/utils/nvram/src/Makefile
similarity index 100%
rename from package/nvram/src/Makefile
rename to package/system/utils/nvram/src/Makefile
diff --git a/package/nvram/src/cli.c b/package/system/utils/nvram/src/cli.c
similarity index 100%
rename from package/nvram/src/cli.c
rename to package/system/utils/nvram/src/cli.c
diff --git a/package/nvram/src/crc.c b/package/system/utils/nvram/src/crc.c
similarity index 100%
rename from package/nvram/src/crc.c
rename to package/system/utils/nvram/src/crc.c
diff --git a/package/nvram/src/nvram.c b/package/system/utils/nvram/src/nvram.c
similarity index 100%
rename from package/nvram/src/nvram.c
rename to package/system/utils/nvram/src/nvram.c
diff --git a/package/nvram/src/nvram.h b/package/system/utils/nvram/src/nvram.h
similarity index 100%
rename from package/nvram/src/nvram.h
rename to package/system/utils/nvram/src/nvram.h
diff --git a/package/nvram/src/sdinitvals.h b/package/system/utils/nvram/src/sdinitvals.h
similarity index 100%
rename from package/nvram/src/sdinitvals.h
rename to package/system/utils/nvram/src/sdinitvals.h
diff --git a/package/robocfg/Makefile b/package/system/utils/robocfg/Makefile
similarity index 100%
rename from package/robocfg/Makefile
rename to package/system/utils/robocfg/Makefile
diff --git a/package/robocfg/src/Makefile b/package/system/utils/robocfg/src/Makefile
similarity index 100%
rename from package/robocfg/src/Makefile
rename to package/system/utils/robocfg/src/Makefile
diff --git a/package/robocfg/src/etc53xx.h b/package/system/utils/robocfg/src/etc53xx.h
similarity index 100%
rename from package/robocfg/src/etc53xx.h
rename to package/system/utils/robocfg/src/etc53xx.h
diff --git a/package/robocfg/src/robocfg.c b/package/system/utils/robocfg/src/robocfg.c
similarity index 100%
rename from package/robocfg/src/robocfg.c
rename to package/system/utils/robocfg/src/robocfg.c
diff --git a/package/usbreset/Makefile b/package/system/utils/usbreset/Makefile
similarity index 100%
rename from package/usbreset/Makefile
rename to package/system/utils/usbreset/Makefile
diff --git a/package/usbreset/src/usbreset.c b/package/system/utils/usbreset/src/usbreset.c
similarity index 100%
rename from package/usbreset/src/usbreset.c
rename to package/system/utils/usbreset/src/usbreset.c
diff --git a/package/xfsprogs/Makefile b/package/system/utils/xfsprogs/Makefile
similarity index 100%
rename from package/xfsprogs/Makefile
rename to package/system/utils/xfsprogs/Makefile
diff --git a/package/xfsprogs/patches/001-automake-compat.patch b/package/system/utils/xfsprogs/patches/001-automake-compat.patch
similarity index 100%
rename from package/xfsprogs/patches/001-automake-compat.patch
rename to package/system/utils/xfsprogs/patches/001-automake-compat.patch
diff --git a/package/xfsprogs/patches/100-no_aio.patch b/package/system/utils/xfsprogs/patches/100-no_aio.patch
similarity index 100%
rename from package/xfsprogs/patches/100-no_aio.patch
rename to package/system/utils/xfsprogs/patches/100-no_aio.patch
diff --git a/package/xfsprogs/patches/110-uclibc_no_ustat.patch b/package/system/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
similarity index 100%
rename from package/xfsprogs/patches/110-uclibc_no_ustat.patch
rename to package/system/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
diff --git a/package/xfsprogs/patches/120-portability.patch b/package/system/utils/xfsprogs/patches/120-portability.patch
similarity index 100%
rename from package/xfsprogs/patches/120-portability.patch
rename to package/system/utils/xfsprogs/patches/120-portability.patch
diff --git a/package/xfsprogs/patches/130-uclibc_no_xattr.patch b/package/system/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
similarity index 100%
rename from package/xfsprogs/patches/130-uclibc_no_xattr.patch
rename to package/system/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
diff --git a/package/xfsprogs/patches/140-no_po.patch b/package/system/utils/xfsprogs/patches/140-no_po.patch
similarity index 100%
rename from package/xfsprogs/patches/140-no_po.patch
rename to package/system/utils/xfsprogs/patches/140-no_po.patch