diff --git a/rbutil/bspatch/LICENSE b/utils/bspatch/LICENSE similarity index 100% rename from rbutil/bspatch/LICENSE rename to utils/bspatch/LICENSE diff --git a/rbutil/bspatch/Makefile b/utils/bspatch/Makefile similarity index 100% rename from rbutil/bspatch/Makefile rename to utils/bspatch/Makefile diff --git a/rbutil/bspatch/bspatch.c b/utils/bspatch/bspatch.c similarity index 100% rename from rbutil/bspatch/bspatch.c rename to utils/bspatch/bspatch.c diff --git a/rbutil/bspatch/bspatch.h b/utils/bspatch/bspatch.h similarity index 100% rename from rbutil/bspatch/bspatch.h rename to utils/bspatch/bspatch.h diff --git a/rbutil/bspatch/main.c b/utils/bspatch/main.c similarity index 100% rename from rbutil/bspatch/main.c rename to utils/bspatch/main.c diff --git a/rbutil/bzip2/LICENSE b/utils/bzip2/LICENSE similarity index 100% rename from rbutil/bzip2/LICENSE rename to utils/bzip2/LICENSE diff --git a/rbutil/bzip2/Makefile b/utils/bzip2/Makefile similarity index 100% rename from rbutil/bzip2/Makefile rename to utils/bzip2/Makefile diff --git a/rbutil/bzip2/blocksort.c b/utils/bzip2/blocksort.c similarity index 100% rename from rbutil/bzip2/blocksort.c rename to utils/bzip2/blocksort.c diff --git a/rbutil/bzip2/bzlib.c b/utils/bzip2/bzlib.c similarity index 100% rename from rbutil/bzip2/bzlib.c rename to utils/bzip2/bzlib.c diff --git a/rbutil/bzip2/bzlib.h b/utils/bzip2/bzlib.h similarity index 100% rename from rbutil/bzip2/bzlib.h rename to utils/bzip2/bzlib.h diff --git a/rbutil/bzip2/bzlib_private.h b/utils/bzip2/bzlib_private.h similarity index 100% rename from rbutil/bzip2/bzlib_private.h rename to utils/bzip2/bzlib_private.h diff --git a/rbutil/bzip2/compress.c b/utils/bzip2/compress.c similarity index 100% rename from rbutil/bzip2/compress.c rename to utils/bzip2/compress.c diff --git a/rbutil/bzip2/crctable.c b/utils/bzip2/crctable.c similarity index 100% rename from rbutil/bzip2/crctable.c rename to utils/bzip2/crctable.c diff --git a/rbutil/bzip2/decompress.c b/utils/bzip2/decompress.c similarity index 100% rename from rbutil/bzip2/decompress.c rename to utils/bzip2/decompress.c diff --git a/rbutil/bzip2/huffman.c b/utils/bzip2/huffman.c similarity index 100% rename from rbutil/bzip2/huffman.c rename to utils/bzip2/huffman.c diff --git a/rbutil/bzip2/randtable.c b/utils/bzip2/randtable.c similarity index 100% rename from rbutil/bzip2/randtable.c rename to utils/bzip2/randtable.c diff --git a/rbutil/chinachippatcher/Makefile b/utils/chinachippatcher/Makefile similarity index 100% rename from rbutil/chinachippatcher/Makefile rename to utils/chinachippatcher/Makefile diff --git a/rbutil/chinachippatcher/chinachip.c b/utils/chinachippatcher/chinachip.c similarity index 100% rename from rbutil/chinachippatcher/chinachip.c rename to utils/chinachippatcher/chinachip.c diff --git a/rbutil/chinachippatcher/chinachip.h b/utils/chinachippatcher/chinachip.h similarity index 100% rename from rbutil/chinachippatcher/chinachip.h rename to utils/chinachippatcher/chinachip.h diff --git a/rbutil/chinachippatcher/main.c b/utils/chinachippatcher/main.c similarity index 100% rename from rbutil/chinachippatcher/main.c rename to utils/chinachippatcher/main.c diff --git a/rbutil/e200rpatcher/Makefile b/utils/e200rpatcher/Makefile similarity index 100% rename from rbutil/e200rpatcher/Makefile rename to utils/e200rpatcher/Makefile diff --git a/rbutil/e200rpatcher/README b/utils/e200rpatcher/README similarity index 100% rename from rbutil/e200rpatcher/README rename to utils/e200rpatcher/README diff --git a/rbutil/e200rpatcher/e200rpatcher.c b/utils/e200rpatcher/e200rpatcher.c similarity index 100% rename from rbutil/e200rpatcher/e200rpatcher.c rename to utils/e200rpatcher/e200rpatcher.c diff --git a/rbutil/e200rpatcher/e200rpatcher.manifest b/utils/e200rpatcher/e200rpatcher.manifest similarity index 100% rename from rbutil/e200rpatcher/e200rpatcher.manifest rename to utils/e200rpatcher/e200rpatcher.manifest diff --git a/rbutil/e200rpatcher/e200rpatcher.rc b/utils/e200rpatcher/e200rpatcher.rc similarity index 100% rename from rbutil/e200rpatcher/e200rpatcher.rc rename to utils/e200rpatcher/e200rpatcher.rc diff --git a/rbutil/ibassoboot/jni/Android.mk b/utils/ibassoboot/jni/Android.mk similarity index 100% rename from rbutil/ibassoboot/jni/Android.mk rename to utils/ibassoboot/jni/Android.mk diff --git a/rbutil/ibassoboot/jni/chooser.bmp b/utils/ibassoboot/jni/chooser.bmp similarity index 100% rename from rbutil/ibassoboot/jni/chooser.bmp rename to utils/ibassoboot/jni/chooser.bmp diff --git a/rbutil/ibassoboot/jni/ibassodualboot.c b/utils/ibassoboot/jni/ibassodualboot.c similarity index 100% rename from rbutil/ibassoboot/jni/ibassodualboot.c rename to utils/ibassoboot/jni/ibassodualboot.c diff --git a/rbutil/ibassoboot/jni/qdbmp.c b/utils/ibassoboot/jni/qdbmp.c similarity index 100% rename from rbutil/ibassoboot/jni/qdbmp.c rename to utils/ibassoboot/jni/qdbmp.c diff --git a/rbutil/ibassoboot/jni/qdbmp.h b/utils/ibassoboot/jni/qdbmp.h similarity index 100% rename from rbutil/ibassoboot/jni/qdbmp.h rename to utils/ibassoboot/jni/qdbmp.h diff --git a/rbutil/ibassoboot/jni/rbmissing.bmp b/utils/ibassoboot/jni/rbmissing.bmp similarity index 100% rename from rbutil/ibassoboot/jni/rbmissing.bmp rename to utils/ibassoboot/jni/rbmissing.bmp diff --git a/rbutil/ibassoboot/jni/usb.bmp b/utils/ibassoboot/jni/usb.bmp similarity index 100% rename from rbutil/ibassoboot/jni/usb.bmp rename to utils/ibassoboot/jni/usb.bmp diff --git a/rbutil/ipodpatcher/Makefile b/utils/ipodpatcher/Makefile similarity index 100% rename from rbutil/ipodpatcher/Makefile rename to utils/ipodpatcher/Makefile diff --git a/rbutil/ipodpatcher/arc4.c b/utils/ipodpatcher/arc4.c similarity index 100% rename from rbutil/ipodpatcher/arc4.c rename to utils/ipodpatcher/arc4.c diff --git a/rbutil/ipodpatcher/arc4.h b/utils/ipodpatcher/arc4.h similarity index 100% rename from rbutil/ipodpatcher/arc4.h rename to utils/ipodpatcher/arc4.h diff --git a/rbutil/ipodpatcher/fat32format.c b/utils/ipodpatcher/fat32format.c similarity index 100% rename from rbutil/ipodpatcher/fat32format.c rename to utils/ipodpatcher/fat32format.c diff --git a/rbutil/ipodpatcher/ipodio-posix.c b/utils/ipodpatcher/ipodio-posix.c similarity index 100% rename from rbutil/ipodpatcher/ipodio-posix.c rename to utils/ipodpatcher/ipodio-posix.c diff --git a/rbutil/ipodpatcher/ipodio-win32-scsi.c b/utils/ipodpatcher/ipodio-win32-scsi.c similarity index 100% rename from rbutil/ipodpatcher/ipodio-win32-scsi.c rename to utils/ipodpatcher/ipodio-win32-scsi.c diff --git a/rbutil/ipodpatcher/ipodio-win32.c b/utils/ipodpatcher/ipodio-win32.c similarity index 100% rename from rbutil/ipodpatcher/ipodio-win32.c rename to utils/ipodpatcher/ipodio-win32.c diff --git a/rbutil/ipodpatcher/ipodio.h b/utils/ipodpatcher/ipodio.h similarity index 100% rename from rbutil/ipodpatcher/ipodio.h rename to utils/ipodpatcher/ipodio.h diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/utils/ipodpatcher/ipodpatcher.c similarity index 100% rename from rbutil/ipodpatcher/ipodpatcher.c rename to utils/ipodpatcher/ipodpatcher.c diff --git a/rbutil/ipodpatcher/ipodpatcher.h b/utils/ipodpatcher/ipodpatcher.h similarity index 100% rename from rbutil/ipodpatcher/ipodpatcher.h rename to utils/ipodpatcher/ipodpatcher.h diff --git a/rbutil/ipodpatcher/ipodpatcher.manifest b/utils/ipodpatcher/ipodpatcher.manifest similarity index 100% rename from rbutil/ipodpatcher/ipodpatcher.manifest rename to utils/ipodpatcher/ipodpatcher.manifest diff --git a/rbutil/ipodpatcher/ipodpatcher.pro b/utils/ipodpatcher/ipodpatcher.pro similarity index 100% rename from rbutil/ipodpatcher/ipodpatcher.pro rename to utils/ipodpatcher/ipodpatcher.pro diff --git a/rbutil/ipodpatcher/ipodpatcher.rc b/utils/ipodpatcher/ipodpatcher.rc similarity index 100% rename from rbutil/ipodpatcher/ipodpatcher.rc rename to utils/ipodpatcher/ipodpatcher.rc diff --git a/rbutil/ipodpatcher/main.c b/utils/ipodpatcher/main.c similarity index 100% rename from rbutil/ipodpatcher/main.c rename to utils/ipodpatcher/main.c diff --git a/rbutil/ipodpatcher/parttypes.h b/utils/ipodpatcher/parttypes.h similarity index 100% rename from rbutil/ipodpatcher/parttypes.h rename to utils/ipodpatcher/parttypes.h diff --git a/rbutil/jztool/Makefile b/utils/jztool/Makefile similarity index 100% rename from rbutil/jztool/Makefile rename to utils/jztool/Makefile diff --git a/rbutil/jztool/README.md b/utils/jztool/README.md similarity index 100% rename from rbutil/jztool/README.md rename to utils/jztool/README.md diff --git a/rbutil/jztool/include/jztool.h b/utils/jztool/include/jztool.h similarity index 100% rename from rbutil/jztool/include/jztool.h rename to utils/jztool/include/jztool.h diff --git a/rbutil/jztool/jztool.c b/utils/jztool/jztool.c similarity index 100% rename from rbutil/jztool/jztool.c rename to utils/jztool/jztool.c diff --git a/rbutil/jztool/src/buffer.c b/utils/jztool/src/buffer.c similarity index 100% rename from rbutil/jztool/src/buffer.c rename to utils/jztool/src/buffer.c diff --git a/rbutil/jztool/src/context.c b/utils/jztool/src/context.c similarity index 100% rename from rbutil/jztool/src/context.c rename to utils/jztool/src/context.c diff --git a/rbutil/jztool/src/device_info.c b/utils/jztool/src/device_info.c similarity index 100% rename from rbutil/jztool/src/device_info.c rename to utils/jztool/src/device_info.c diff --git a/rbutil/jztool/src/identify_file.c b/utils/jztool/src/identify_file.c similarity index 100% rename from rbutil/jztool/src/identify_file.c rename to utils/jztool/src/identify_file.c diff --git a/rbutil/jztool/src/jztool_private.h b/utils/jztool/src/jztool_private.h similarity index 100% rename from rbutil/jztool/src/jztool_private.h rename to utils/jztool/src/jztool_private.h diff --git a/rbutil/jztool/src/ucl_unpack.c b/utils/jztool/src/ucl_unpack.c similarity index 100% rename from rbutil/jztool/src/ucl_unpack.c rename to utils/jztool/src/ucl_unpack.c diff --git a/rbutil/jztool/src/usb.c b/utils/jztool/src/usb.c similarity index 100% rename from rbutil/jztool/src/usb.c rename to utils/jztool/src/usb.c diff --git a/rbutil/jztool/src/x1000.c b/utils/jztool/src/x1000.c similarity index 100% rename from rbutil/jztool/src/x1000.c rename to utils/jztool/src/x1000.c diff --git a/rbutil/libtools.make b/utils/libtools.make similarity index 100% rename from rbutil/libtools.make rename to utils/libtools.make diff --git a/rbutil/mkamsboot/.gitignore b/utils/mkamsboot/.gitignore similarity index 100% rename from rbutil/mkamsboot/.gitignore rename to utils/mkamsboot/.gitignore diff --git a/rbutil/mkamsboot/Makefile b/utils/mkamsboot/Makefile similarity index 100% rename from rbutil/mkamsboot/Makefile rename to utils/mkamsboot/Makefile diff --git a/rbutil/mkamsboot/README b/utils/mkamsboot/README similarity index 100% rename from rbutil/mkamsboot/README rename to utils/mkamsboot/README diff --git a/rbutil/mkamsboot/dualboot.c b/utils/mkamsboot/dualboot.c similarity index 100% rename from rbutil/mkamsboot/dualboot.c rename to utils/mkamsboot/dualboot.c diff --git a/rbutil/mkamsboot/dualboot.h b/utils/mkamsboot/dualboot.h similarity index 100% rename from rbutil/mkamsboot/dualboot.h rename to utils/mkamsboot/dualboot.h diff --git a/rbutil/mkamsboot/dualboot/.gitignore b/utils/mkamsboot/dualboot/.gitignore similarity index 100% rename from rbutil/mkamsboot/dualboot/.gitignore rename to utils/mkamsboot/dualboot/.gitignore diff --git a/rbutil/mkamsboot/dualboot/Makefile b/utils/mkamsboot/dualboot/Makefile similarity index 100% rename from rbutil/mkamsboot/dualboot/Makefile rename to utils/mkamsboot/dualboot/Makefile diff --git a/rbutil/mkamsboot/dualboot/bin2c.c b/utils/mkamsboot/dualboot/bin2c.c similarity index 100% rename from rbutil/mkamsboot/dualboot/bin2c.c rename to utils/mkamsboot/dualboot/bin2c.c diff --git a/rbutil/mkamsboot/dualboot/dualboot.S b/utils/mkamsboot/dualboot/dualboot.S similarity index 100% rename from rbutil/mkamsboot/dualboot/dualboot.S rename to utils/mkamsboot/dualboot/dualboot.S diff --git a/rbutil/mkamsboot/dualboot/nrv2e_d8.S b/utils/mkamsboot/dualboot/nrv2e_d8.S similarity index 100% rename from rbutil/mkamsboot/dualboot/nrv2e_d8.S rename to utils/mkamsboot/dualboot/nrv2e_d8.S diff --git a/rbutil/mkamsboot/main.c b/utils/mkamsboot/main.c similarity index 100% rename from rbutil/mkamsboot/main.c rename to utils/mkamsboot/main.c diff --git a/rbutil/mkamsboot/md5.c b/utils/mkamsboot/md5.c similarity index 100% rename from rbutil/mkamsboot/md5.c rename to utils/mkamsboot/md5.c diff --git a/rbutil/mkamsboot/md5.h b/utils/mkamsboot/md5.h similarity index 100% rename from rbutil/mkamsboot/md5.h rename to utils/mkamsboot/md5.h diff --git a/rbutil/mkamsboot/mkamsboot.c b/utils/mkamsboot/mkamsboot.c similarity index 100% rename from rbutil/mkamsboot/mkamsboot.c rename to utils/mkamsboot/mkamsboot.c diff --git a/rbutil/mkamsboot/mkamsboot.h b/utils/mkamsboot/mkamsboot.h similarity index 100% rename from rbutil/mkamsboot/mkamsboot.h rename to utils/mkamsboot/mkamsboot.h diff --git a/rbutil/mkimxboot/Makefile b/utils/mkimxboot/Makefile similarity index 100% rename from rbutil/mkimxboot/Makefile rename to utils/mkimxboot/Makefile diff --git a/rbutil/mkimxboot/dualboot.c b/utils/mkimxboot/dualboot.c similarity index 100% rename from rbutil/mkimxboot/dualboot.c rename to utils/mkimxboot/dualboot.c diff --git a/rbutil/mkimxboot/dualboot.h b/utils/mkimxboot/dualboot.h similarity index 100% rename from rbutil/mkimxboot/dualboot.h rename to utils/mkimxboot/dualboot.h diff --git a/rbutil/mkimxboot/dualboot/Makefile b/utils/mkimxboot/dualboot/Makefile similarity index 100% rename from rbutil/mkimxboot/dualboot/Makefile rename to utils/mkimxboot/dualboot/Makefile diff --git a/rbutil/mkimxboot/dualboot/bin2c.c b/utils/mkimxboot/dualboot/bin2c.c similarity index 100% rename from rbutil/mkimxboot/dualboot/bin2c.c rename to utils/mkimxboot/dualboot/bin2c.c diff --git a/rbutil/mkimxboot/dualboot/config.h b/utils/mkimxboot/dualboot/config.h similarity index 100% rename from rbutil/mkimxboot/dualboot/config.h rename to utils/mkimxboot/dualboot/config.h diff --git a/rbutil/mkimxboot/dualboot/dualboot.c b/utils/mkimxboot/dualboot/dualboot.c similarity index 100% rename from rbutil/mkimxboot/dualboot/dualboot.c rename to utils/mkimxboot/dualboot/dualboot.c diff --git a/rbutil/mkimxboot/dualboot/dualboot.lds b/utils/mkimxboot/dualboot/dualboot.lds similarity index 100% rename from rbutil/mkimxboot/dualboot/dualboot.lds rename to utils/mkimxboot/dualboot/dualboot.lds diff --git a/rbutil/mkimxboot/main.c b/utils/mkimxboot/main.c similarity index 100% rename from rbutil/mkimxboot/main.c rename to utils/mkimxboot/main.c diff --git a/rbutil/mkimxboot/md5.c b/utils/mkimxboot/md5.c similarity index 100% rename from rbutil/mkimxboot/md5.c rename to utils/mkimxboot/md5.c diff --git a/rbutil/mkimxboot/md5.h b/utils/mkimxboot/md5.h similarity index 100% rename from rbutil/mkimxboot/md5.h rename to utils/mkimxboot/md5.h diff --git a/rbutil/mkimxboot/mkimxboot.c b/utils/mkimxboot/mkimxboot.c similarity index 100% rename from rbutil/mkimxboot/mkimxboot.c rename to utils/mkimxboot/mkimxboot.c diff --git a/rbutil/mkimxboot/mkimxboot.h b/utils/mkimxboot/mkimxboot.h similarity index 100% rename from rbutil/mkimxboot/mkimxboot.h rename to utils/mkimxboot/mkimxboot.h diff --git a/rbutil/mkmpioboot/Makefile b/utils/mkmpioboot/Makefile similarity index 100% rename from rbutil/mkmpioboot/Makefile rename to utils/mkmpioboot/Makefile diff --git a/rbutil/mkmpioboot/main.c b/utils/mkmpioboot/main.c similarity index 100% rename from rbutil/mkmpioboot/main.c rename to utils/mkmpioboot/main.c diff --git a/rbutil/mkmpioboot/mkmpioboot.c b/utils/mkmpioboot/mkmpioboot.c similarity index 100% rename from rbutil/mkmpioboot/mkmpioboot.c rename to utils/mkmpioboot/mkmpioboot.c diff --git a/rbutil/mkmpioboot/mkmpioboot.h b/utils/mkmpioboot/mkmpioboot.h similarity index 100% rename from rbutil/mkmpioboot/mkmpioboot.h rename to utils/mkmpioboot/mkmpioboot.h diff --git a/rbutil/mknwzboot/Makefile b/utils/mknwzboot/Makefile similarity index 100% rename from rbutil/mknwzboot/Makefile rename to utils/mknwzboot/Makefile diff --git a/rbutil/mknwzboot/install_script.sh b/utils/mknwzboot/install_script.sh similarity index 100% rename from rbutil/mknwzboot/install_script.sh rename to utils/mknwzboot/install_script.sh diff --git a/rbutil/mknwzboot/main.c b/utils/mknwzboot/main.c similarity index 100% rename from rbutil/mknwzboot/main.c rename to utils/mknwzboot/main.c diff --git a/rbutil/mknwzboot/mknwzboot.c b/utils/mknwzboot/mknwzboot.c similarity index 100% rename from rbutil/mknwzboot/mknwzboot.c rename to utils/mknwzboot/mknwzboot.c diff --git a/rbutil/mknwzboot/mknwzboot.h b/utils/mknwzboot/mknwzboot.h similarity index 100% rename from rbutil/mknwzboot/mknwzboot.h rename to utils/mknwzboot/mknwzboot.h diff --git a/rbutil/mknwzboot/uninstall_script.sh b/utils/mknwzboot/uninstall_script.sh similarity index 100% rename from rbutil/mknwzboot/uninstall_script.sh rename to utils/mknwzboot/uninstall_script.sh diff --git a/rbutil/mkrk27boot/Makefile b/utils/mkrk27boot/Makefile similarity index 100% rename from rbutil/mkrk27boot/Makefile rename to utils/mkrk27boot/Makefile diff --git a/rbutil/mkrk27boot/ata-sim.c b/utils/mkrk27boot/ata-sim.c similarity index 100% rename from rbutil/mkrk27boot/ata-sim.c rename to utils/mkrk27boot/ata-sim.c diff --git a/rbutil/mkrk27boot/autoconf.h b/utils/mkrk27boot/autoconf.h similarity index 100% rename from rbutil/mkrk27boot/autoconf.h rename to utils/mkrk27boot/autoconf.h diff --git a/rbutil/mkrk27boot/main.c b/utils/mkrk27boot/main.c similarity index 100% rename from rbutil/mkrk27boot/main.c rename to utils/mkrk27boot/main.c diff --git a/rbutil/mkrk27boot/mkrk27boot.c b/utils/mkrk27boot/mkrk27boot.c similarity index 100% rename from rbutil/mkrk27boot/mkrk27boot.c rename to utils/mkrk27boot/mkrk27boot.c diff --git a/rbutil/mkrk27boot/mkrk27boot.h b/utils/mkrk27boot/mkrk27boot.h similarity index 100% rename from rbutil/mkrk27boot/mkrk27boot.h rename to utils/mkrk27boot/mkrk27boot.h diff --git a/rbutil/mks5lboot/.gitignore b/utils/mks5lboot/.gitignore similarity index 100% rename from rbutil/mks5lboot/.gitignore rename to utils/mks5lboot/.gitignore diff --git a/rbutil/mks5lboot/Makefile b/utils/mks5lboot/Makefile similarity index 100% rename from rbutil/mks5lboot/Makefile rename to utils/mks5lboot/Makefile diff --git a/rbutil/mks5lboot/README b/utils/mks5lboot/README similarity index 100% rename from rbutil/mks5lboot/README rename to utils/mks5lboot/README diff --git a/rbutil/mks5lboot/dualboot.c b/utils/mks5lboot/dualboot.c similarity index 100% rename from rbutil/mks5lboot/dualboot.c rename to utils/mks5lboot/dualboot.c diff --git a/rbutil/mks5lboot/dualboot.h b/utils/mks5lboot/dualboot.h similarity index 100% rename from rbutil/mks5lboot/dualboot.h rename to utils/mks5lboot/dualboot.h diff --git a/rbutil/mks5lboot/dualboot/.gitignore b/utils/mks5lboot/dualboot/.gitignore similarity index 100% rename from rbutil/mks5lboot/dualboot/.gitignore rename to utils/mks5lboot/dualboot/.gitignore diff --git a/rbutil/mks5lboot/dualboot/Makefile b/utils/mks5lboot/dualboot/Makefile similarity index 100% rename from rbutil/mks5lboot/dualboot/Makefile rename to utils/mks5lboot/dualboot/Makefile diff --git a/rbutil/mks5lboot/dualboot/autoconf.h b/utils/mks5lboot/dualboot/autoconf.h similarity index 100% rename from rbutil/mks5lboot/dualboot/autoconf.h rename to utils/mks5lboot/dualboot/autoconf.h diff --git a/rbutil/mks5lboot/dualboot/bin2c.c b/utils/mks5lboot/dualboot/bin2c.c similarity index 100% rename from rbutil/mks5lboot/dualboot/bin2c.c rename to utils/mks5lboot/dualboot/bin2c.c diff --git a/rbutil/mks5lboot/dualboot/dualboot.c b/utils/mks5lboot/dualboot/dualboot.c similarity index 100% rename from rbutil/mks5lboot/dualboot/dualboot.c rename to utils/mks5lboot/dualboot/dualboot.c diff --git a/rbutil/mks5lboot/dualboot/dualboot.lds b/utils/mks5lboot/dualboot/dualboot.lds similarity index 100% rename from rbutil/mks5lboot/dualboot/dualboot.lds rename to utils/mks5lboot/dualboot/dualboot.lds diff --git a/rbutil/mks5lboot/dualboot/init.S b/utils/mks5lboot/dualboot/init.S similarity index 100% rename from rbutil/mks5lboot/dualboot/init.S rename to utils/mks5lboot/dualboot/init.S diff --git a/rbutil/mks5lboot/ipoddfu.c b/utils/mks5lboot/ipoddfu.c similarity index 100% rename from rbutil/mks5lboot/ipoddfu.c rename to utils/mks5lboot/ipoddfu.c diff --git a/rbutil/mks5lboot/main.c b/utils/mks5lboot/main.c similarity index 100% rename from rbutil/mks5lboot/main.c rename to utils/mks5lboot/main.c diff --git a/rbutil/mks5lboot/mkdfu.c b/utils/mks5lboot/mkdfu.c similarity index 100% rename from rbutil/mks5lboot/mkdfu.c rename to utils/mks5lboot/mkdfu.c diff --git a/rbutil/mks5lboot/mks5lboot.h b/utils/mks5lboot/mks5lboot.h similarity index 100% rename from rbutil/mks5lboot/mks5lboot.h rename to utils/mks5lboot/mks5lboot.h diff --git a/rbutil/mktccboot/Makefile b/utils/mktccboot/Makefile similarity index 100% rename from rbutil/mktccboot/Makefile rename to utils/mktccboot/Makefile diff --git a/rbutil/mktccboot/README b/utils/mktccboot/README similarity index 100% rename from rbutil/mktccboot/README rename to utils/mktccboot/README diff --git a/rbutil/mktccboot/main.c b/utils/mktccboot/main.c similarity index 100% rename from rbutil/mktccboot/main.c rename to utils/mktccboot/main.c diff --git a/rbutil/mktccboot/mktccboot.c b/utils/mktccboot/mktccboot.c similarity index 100% rename from rbutil/mktccboot/mktccboot.c rename to utils/mktccboot/mktccboot.c diff --git a/rbutil/mktccboot/mktccboot.h b/utils/mktccboot/mktccboot.h similarity index 100% rename from rbutil/mktccboot/mktccboot.h rename to utils/mktccboot/mktccboot.h diff --git a/rbutil/mkzenboot/Makefile b/utils/mkzenboot/Makefile similarity index 100% rename from rbutil/mkzenboot/Makefile rename to utils/mkzenboot/Makefile diff --git a/rbutil/mkzenboot/dualboot.c b/utils/mkzenboot/dualboot.c similarity index 100% rename from rbutil/mkzenboot/dualboot.c rename to utils/mkzenboot/dualboot.c diff --git a/rbutil/mkzenboot/dualboot.h b/utils/mkzenboot/dualboot.h similarity index 100% rename from rbutil/mkzenboot/dualboot.h rename to utils/mkzenboot/dualboot.h diff --git a/rbutil/mkzenboot/dualboot/Makefile b/utils/mkzenboot/dualboot/Makefile similarity index 100% rename from rbutil/mkzenboot/dualboot/Makefile rename to utils/mkzenboot/dualboot/Makefile diff --git a/rbutil/mkzenboot/dualboot/bin2c.c b/utils/mkzenboot/dualboot/bin2c.c similarity index 100% rename from rbutil/mkzenboot/dualboot/bin2c.c rename to utils/mkzenboot/dualboot/bin2c.c diff --git a/rbutil/mkzenboot/dualboot/config.h b/utils/mkzenboot/dualboot/config.h similarity index 100% rename from rbutil/mkzenboot/dualboot/config.h rename to utils/mkzenboot/dualboot/config.h diff --git a/rbutil/mkzenboot/dualboot/dualboot.c b/utils/mkzenboot/dualboot/dualboot.c similarity index 100% rename from rbutil/mkzenboot/dualboot/dualboot.c rename to utils/mkzenboot/dualboot/dualboot.c diff --git a/rbutil/mkzenboot/dualboot/dualboot.lds b/utils/mkzenboot/dualboot/dualboot.lds similarity index 100% rename from rbutil/mkzenboot/dualboot/dualboot.lds rename to utils/mkzenboot/dualboot/dualboot.lds diff --git a/rbutil/mkzenboot/main.c b/utils/mkzenboot/main.c similarity index 100% rename from rbutil/mkzenboot/main.c rename to utils/mkzenboot/main.c diff --git a/rbutil/mkzenboot/md5.c b/utils/mkzenboot/md5.c similarity index 100% rename from rbutil/mkzenboot/md5.c rename to utils/mkzenboot/md5.c diff --git a/rbutil/mkzenboot/md5.h b/utils/mkzenboot/md5.h similarity index 100% rename from rbutil/mkzenboot/md5.h rename to utils/mkzenboot/md5.h diff --git a/rbutil/mkzenboot/mkzenboot.c b/utils/mkzenboot/mkzenboot.c similarity index 100% rename from rbutil/mkzenboot/mkzenboot.c rename to utils/mkzenboot/mkzenboot.c diff --git a/rbutil/mkzenboot/mkzenboot.h b/utils/mkzenboot/mkzenboot.h similarity index 100% rename from rbutil/mkzenboot/mkzenboot.h rename to utils/mkzenboot/mkzenboot.h diff --git a/rbutil/mkzenboot/utils.c b/utils/mkzenboot/utils.c similarity index 100% rename from rbutil/mkzenboot/utils.c rename to utils/mkzenboot/utils.c diff --git a/rbutil/mkzenboot/utils.h b/utils/mkzenboot/utils.h similarity index 100% rename from rbutil/mkzenboot/utils.h rename to utils/mkzenboot/utils.h diff --git a/rbutil/rbutil.pro b/utils/rbutil.pro similarity index 100% rename from rbutil/rbutil.pro rename to utils/rbutil.pro diff --git a/rbutil/rbutilqt/INSTALL b/utils/rbutilqt/INSTALL similarity index 100% rename from rbutil/rbutilqt/INSTALL rename to utils/rbutilqt/INSTALL diff --git a/rbutil/rbutilqt/Info.plist b/utils/rbutilqt/Info.plist similarity index 100% rename from rbutil/rbutilqt/Info.plist rename to utils/rbutilqt/Info.plist diff --git a/rbutil/rbutilqt/Makefile.libs b/utils/rbutilqt/Makefile.libs similarity index 63% rename from rbutil/rbutilqt/Makefile.libs rename to utils/rbutilqt/Makefile.libs index f95fd52ab9..a78f8b86e9 100644 --- a/rbutil/rbutilqt/Makefile.libs +++ b/utils/rbutilqt/Makefile.libs @@ -49,31 +49,31 @@ libucl: $(SILENT)$(MAKE) -C $(RBBASE_DIR)/tools/ucl/src BUILD_DIR=$(BUILD_DIR)/ucl libucl.a libipodpatcher: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/ipodpatcher BUILD_DIR=$(BUILD_DIR)/ipodpatcher libipodpatcher.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/ipodpatcher BUILD_DIR=$(BUILD_DIR)/ipodpatcher libipodpatcher.a CC=$(CC) libsansapatcher: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/sansapatcher BUILD_DIR=$(BUILD_DIR)/sansapatcher libsansapatcher.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/sansapatcher BUILD_DIR=$(BUILD_DIR)/sansapatcher libsansapatcher.a CC=$(CC) libmkamsboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkamsboot BUILD_DIR=$(BUILD_DIR)/mkamsboot libmkamsboot.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mkamsboot BUILD_DIR=$(BUILD_DIR)/mkamsboot libmkamsboot.a CC=$(CC) libmktccboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mktccboot BUILD_DIR=$(BUILD_DIR)/mktccboot libmktccboot.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mktccboot BUILD_DIR=$(BUILD_DIR)/mktccboot libmktccboot.a CC=$(CC) libmkmpioboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkmpioboot BUILD_DIR=$(BUILD_DIR)/mkmpioboot libmkmpioboot.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mkmpioboot BUILD_DIR=$(BUILD_DIR)/mkmpioboot libmkmpioboot.a CC=$(CC) libchinachippatcher: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/chinachippatcher BUILD_DIR=$(BUILD_DIR)/chinachippatcher libchinachippatcher.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/chinachippatcher BUILD_DIR=$(BUILD_DIR)/chinachippatcher libchinachippatcher.a CC=$(CC) libmkimxboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkimxboot BUILD_DIR=$(BUILD_DIR)/mkimxboot libmkimxboot.a CC=$(CC) CXX=$(CXX) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mkimxboot BUILD_DIR=$(BUILD_DIR)/mkimxboot libmkimxboot.a CC=$(CC) CXX=$(CXX) libmks5lboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC) libbz2: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC) libbspatch: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC) + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC) diff --git a/rbutil/rbutilqt/RockboxUtility.desktop b/utils/rbutilqt/RockboxUtility.desktop similarity index 100% rename from rbutil/rbutilqt/RockboxUtility.desktop rename to utils/rbutilqt/RockboxUtility.desktop diff --git a/rbutil/rbutilqt/aboutbox.ui b/utils/rbutilqt/aboutbox.ui similarity index 100% rename from rbutil/rbutilqt/aboutbox.ui rename to utils/rbutilqt/aboutbox.ui diff --git a/rbutil/rbutilqt/base/archiveutil.cpp b/utils/rbutilqt/base/archiveutil.cpp similarity index 100% rename from rbutil/rbutilqt/base/archiveutil.cpp rename to utils/rbutilqt/base/archiveutil.cpp diff --git a/rbutil/rbutilqt/base/archiveutil.h b/utils/rbutilqt/base/archiveutil.h similarity index 100% rename from rbutil/rbutilqt/base/archiveutil.h rename to utils/rbutilqt/base/archiveutil.h diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/utils/rbutilqt/base/autodetection.cpp similarity index 100% rename from rbutil/rbutilqt/base/autodetection.cpp rename to utils/rbutilqt/base/autodetection.cpp diff --git a/rbutil/rbutilqt/base/autodetection.h b/utils/rbutilqt/base/autodetection.h similarity index 100% rename from rbutil/rbutilqt/base/autodetection.h rename to utils/rbutilqt/base/autodetection.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/utils/rbutilqt/base/bootloaderinstallams.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallams.cpp rename to utils/rbutilqt/base/bootloaderinstallams.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.h b/utils/rbutilqt/base/bootloaderinstallams.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallams.h rename to utils/rbutilqt/base/bootloaderinstallams.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/utils/rbutilqt/base/bootloaderinstallbase.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallbase.cpp rename to utils/rbutilqt/base/bootloaderinstallbase.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallbase.h rename to utils/rbutilqt/base/bootloaderinstallbase.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp b/utils/rbutilqt/base/bootloaderinstallbspatch.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp rename to utils/rbutilqt/base/bootloaderinstallbspatch.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallbspatch.h b/utils/rbutilqt/base/bootloaderinstallbspatch.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallbspatch.h rename to utils/rbutilqt/base/bootloaderinstallbspatch.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp b/utils/rbutilqt/base/bootloaderinstallchinachip.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp rename to utils/rbutilqt/base/bootloaderinstallchinachip.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.h b/utils/rbutilqt/base/bootloaderinstallchinachip.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallchinachip.h rename to utils/rbutilqt/base/bootloaderinstallchinachip.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp b/utils/rbutilqt/base/bootloaderinstallfile.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallfile.cpp rename to utils/rbutilqt/base/bootloaderinstallfile.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.h b/utils/rbutilqt/base/bootloaderinstallfile.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallfile.h rename to utils/rbutilqt/base/bootloaderinstallfile.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp b/utils/rbutilqt/base/bootloaderinstallhelper.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallhelper.cpp rename to utils/rbutilqt/base/bootloaderinstallhelper.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallhelper.h b/utils/rbutilqt/base/bootloaderinstallhelper.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallhelper.h rename to utils/rbutilqt/base/bootloaderinstallhelper.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/utils/rbutilqt/base/bootloaderinstallhex.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallhex.cpp rename to utils/rbutilqt/base/bootloaderinstallhex.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.h b/utils/rbutilqt/base/bootloaderinstallhex.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallhex.h rename to utils/rbutilqt/base/bootloaderinstallhex.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp b/utils/rbutilqt/base/bootloaderinstallimx.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallimx.cpp rename to utils/rbutilqt/base/bootloaderinstallimx.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.h b/utils/rbutilqt/base/bootloaderinstallimx.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallimx.h rename to utils/rbutilqt/base/bootloaderinstallimx.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/utils/rbutilqt/base/bootloaderinstallipod.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallipod.cpp rename to utils/rbutilqt/base/bootloaderinstallipod.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.h b/utils/rbutilqt/base/bootloaderinstallipod.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallipod.h rename to utils/rbutilqt/base/bootloaderinstallipod.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/utils/rbutilqt/base/bootloaderinstallmi4.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallmi4.cpp rename to utils/rbutilqt/base/bootloaderinstallmi4.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.h b/utils/rbutilqt/base/bootloaderinstallmi4.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallmi4.h rename to utils/rbutilqt/base/bootloaderinstallmi4.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp b/utils/rbutilqt/base/bootloaderinstallmpio.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallmpio.cpp rename to utils/rbutilqt/base/bootloaderinstallmpio.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.h b/utils/rbutilqt/base/bootloaderinstallmpio.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallmpio.h rename to utils/rbutilqt/base/bootloaderinstallmpio.h diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/utils/rbutilqt/base/bootloaderinstalls5l.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstalls5l.cpp rename to utils/rbutilqt/base/bootloaderinstalls5l.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.h b/utils/rbutilqt/base/bootloaderinstalls5l.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstalls5l.h rename to utils/rbutilqt/base/bootloaderinstalls5l.h diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/utils/rbutilqt/base/bootloaderinstallsansa.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallsansa.cpp rename to utils/rbutilqt/base/bootloaderinstallsansa.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.h b/utils/rbutilqt/base/bootloaderinstallsansa.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstallsansa.h rename to utils/rbutilqt/base/bootloaderinstallsansa.h diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp b/utils/rbutilqt/base/bootloaderinstalltcc.cpp similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstalltcc.cpp rename to utils/rbutilqt/base/bootloaderinstalltcc.cpp diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.h b/utils/rbutilqt/base/bootloaderinstalltcc.h similarity index 100% rename from rbutil/rbutilqt/base/bootloaderinstalltcc.h rename to utils/rbutilqt/base/bootloaderinstalltcc.h diff --git a/rbutil/rbutilqt/base/encoderbase.cpp b/utils/rbutilqt/base/encoderbase.cpp similarity index 100% rename from rbutil/rbutilqt/base/encoderbase.cpp rename to utils/rbutilqt/base/encoderbase.cpp diff --git a/rbutil/rbutilqt/base/encoderbase.h b/utils/rbutilqt/base/encoderbase.h similarity index 100% rename from rbutil/rbutilqt/base/encoderbase.h rename to utils/rbutilqt/base/encoderbase.h diff --git a/rbutil/rbutilqt/base/encoderexe.cpp b/utils/rbutilqt/base/encoderexe.cpp similarity index 100% rename from rbutil/rbutilqt/base/encoderexe.cpp rename to utils/rbutilqt/base/encoderexe.cpp diff --git a/rbutil/rbutilqt/base/encoderexe.h b/utils/rbutilqt/base/encoderexe.h similarity index 100% rename from rbutil/rbutilqt/base/encoderexe.h rename to utils/rbutilqt/base/encoderexe.h diff --git a/rbutil/rbutilqt/base/encoderlame.cpp b/utils/rbutilqt/base/encoderlame.cpp similarity index 100% rename from rbutil/rbutilqt/base/encoderlame.cpp rename to utils/rbutilqt/base/encoderlame.cpp diff --git a/rbutil/rbutilqt/base/encoderlame.h b/utils/rbutilqt/base/encoderlame.h similarity index 100% rename from rbutil/rbutilqt/base/encoderlame.h rename to utils/rbutilqt/base/encoderlame.h diff --git a/rbutil/rbutilqt/base/encoderrbspeex.cpp b/utils/rbutilqt/base/encoderrbspeex.cpp similarity index 100% rename from rbutil/rbutilqt/base/encoderrbspeex.cpp rename to utils/rbutilqt/base/encoderrbspeex.cpp diff --git a/rbutil/rbutilqt/base/encoderrbspeex.h b/utils/rbutilqt/base/encoderrbspeex.h similarity index 100% rename from rbutil/rbutilqt/base/encoderrbspeex.h rename to utils/rbutilqt/base/encoderrbspeex.h diff --git a/rbutil/rbutilqt/base/encttssettings.cpp b/utils/rbutilqt/base/encttssettings.cpp similarity index 100% rename from rbutil/rbutilqt/base/encttssettings.cpp rename to utils/rbutilqt/base/encttssettings.cpp diff --git a/rbutil/rbutilqt/base/encttssettings.h b/utils/rbutilqt/base/encttssettings.h similarity index 100% rename from rbutil/rbutilqt/base/encttssettings.h rename to utils/rbutilqt/base/encttssettings.h diff --git a/rbutil/rbutilqt/base/httpget.cpp b/utils/rbutilqt/base/httpget.cpp similarity index 100% rename from rbutil/rbutilqt/base/httpget.cpp rename to utils/rbutilqt/base/httpget.cpp diff --git a/rbutil/rbutilqt/base/httpget.h b/utils/rbutilqt/base/httpget.h similarity index 100% rename from rbutil/rbutilqt/base/httpget.h rename to utils/rbutilqt/base/httpget.h diff --git a/rbutil/rbutilqt/base/mspackutil.cpp b/utils/rbutilqt/base/mspackutil.cpp similarity index 100% rename from rbutil/rbutilqt/base/mspackutil.cpp rename to utils/rbutilqt/base/mspackutil.cpp diff --git a/rbutil/rbutilqt/base/mspackutil.h b/utils/rbutilqt/base/mspackutil.h similarity index 100% rename from rbutil/rbutilqt/base/mspackutil.h rename to utils/rbutilqt/base/mspackutil.h diff --git a/rbutil/rbutilqt/base/playerbuildinfo.cpp b/utils/rbutilqt/base/playerbuildinfo.cpp similarity index 100% rename from rbutil/rbutilqt/base/playerbuildinfo.cpp rename to utils/rbutilqt/base/playerbuildinfo.cpp diff --git a/rbutil/rbutilqt/base/playerbuildinfo.h b/utils/rbutilqt/base/playerbuildinfo.h similarity index 100% rename from rbutil/rbutilqt/base/playerbuildinfo.h rename to utils/rbutilqt/base/playerbuildinfo.h diff --git a/rbutil/rbutilqt/base/progressloggerinterface.h b/utils/rbutilqt/base/progressloggerinterface.h similarity index 100% rename from rbutil/rbutilqt/base/progressloggerinterface.h rename to utils/rbutilqt/base/progressloggerinterface.h diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/utils/rbutilqt/base/rbsettings.cpp similarity index 100% rename from rbutil/rbutilqt/base/rbsettings.cpp rename to utils/rbutilqt/base/rbsettings.cpp diff --git a/rbutil/rbutilqt/base/rbsettings.h b/utils/rbutilqt/base/rbsettings.h similarity index 100% rename from rbutil/rbutilqt/base/rbsettings.h rename to utils/rbutilqt/base/rbsettings.h diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/utils/rbutilqt/base/rockboxinfo.cpp similarity index 100% rename from rbutil/rbutilqt/base/rockboxinfo.cpp rename to utils/rbutilqt/base/rockboxinfo.cpp diff --git a/rbutil/rbutilqt/base/rockboxinfo.h b/utils/rbutilqt/base/rockboxinfo.h similarity index 100% rename from rbutil/rbutilqt/base/rockboxinfo.h rename to utils/rbutilqt/base/rockboxinfo.h diff --git a/rbutil/rbutilqt/base/system.cpp b/utils/rbutilqt/base/system.cpp similarity index 100% rename from rbutil/rbutilqt/base/system.cpp rename to utils/rbutilqt/base/system.cpp diff --git a/rbutil/rbutilqt/base/system.h b/utils/rbutilqt/base/system.h similarity index 100% rename from rbutil/rbutilqt/base/system.h rename to utils/rbutilqt/base/system.h diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp similarity index 100% rename from rbutil/rbutilqt/base/talkfile.cpp rename to utils/rbutilqt/base/talkfile.cpp diff --git a/rbutil/rbutilqt/base/talkfile.h b/utils/rbutilqt/base/talkfile.h similarity index 100% rename from rbutil/rbutilqt/base/talkfile.h rename to utils/rbutilqt/base/talkfile.h diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/utils/rbutilqt/base/talkgenerator.cpp similarity index 100% rename from rbutil/rbutilqt/base/talkgenerator.cpp rename to utils/rbutilqt/base/talkgenerator.cpp diff --git a/rbutil/rbutilqt/base/talkgenerator.h b/utils/rbutilqt/base/talkgenerator.h similarity index 100% rename from rbutil/rbutilqt/base/talkgenerator.h rename to utils/rbutilqt/base/talkgenerator.h diff --git a/rbutil/rbutilqt/base/ttsbase.cpp b/utils/rbutilqt/base/ttsbase.cpp similarity index 100% rename from rbutil/rbutilqt/base/ttsbase.cpp rename to utils/rbutilqt/base/ttsbase.cpp diff --git a/rbutil/rbutilqt/base/ttsbase.h b/utils/rbutilqt/base/ttsbase.h similarity index 100% rename from rbutil/rbutilqt/base/ttsbase.h rename to utils/rbutilqt/base/ttsbase.h diff --git a/rbutil/rbutilqt/base/ttscarbon.cpp b/utils/rbutilqt/base/ttscarbon.cpp similarity index 100% rename from rbutil/rbutilqt/base/ttscarbon.cpp rename to utils/rbutilqt/base/ttscarbon.cpp diff --git a/rbutil/rbutilqt/base/ttscarbon.h b/utils/rbutilqt/base/ttscarbon.h similarity index 100% rename from rbutil/rbutilqt/base/ttscarbon.h rename to utils/rbutilqt/base/ttscarbon.h diff --git a/rbutil/rbutilqt/base/ttsespeak.h b/utils/rbutilqt/base/ttsespeak.h similarity index 100% rename from rbutil/rbutilqt/base/ttsespeak.h rename to utils/rbutilqt/base/ttsespeak.h diff --git a/rbutil/rbutilqt/base/ttsespeakng.h b/utils/rbutilqt/base/ttsespeakng.h similarity index 100% rename from rbutil/rbutilqt/base/ttsespeakng.h rename to utils/rbutilqt/base/ttsespeakng.h diff --git a/rbutil/rbutilqt/base/ttsexes.cpp b/utils/rbutilqt/base/ttsexes.cpp similarity index 100% rename from rbutil/rbutilqt/base/ttsexes.cpp rename to utils/rbutilqt/base/ttsexes.cpp diff --git a/rbutil/rbutilqt/base/ttsexes.h b/utils/rbutilqt/base/ttsexes.h similarity index 100% rename from rbutil/rbutilqt/base/ttsexes.h rename to utils/rbutilqt/base/ttsexes.h diff --git a/rbutil/rbutilqt/base/ttsfestival.cpp b/utils/rbutilqt/base/ttsfestival.cpp similarity index 100% rename from rbutil/rbutilqt/base/ttsfestival.cpp rename to utils/rbutilqt/base/ttsfestival.cpp diff --git a/rbutil/rbutilqt/base/ttsfestival.h b/utils/rbutilqt/base/ttsfestival.h similarity index 100% rename from rbutil/rbutilqt/base/ttsfestival.h rename to utils/rbutilqt/base/ttsfestival.h diff --git a/rbutil/rbutilqt/base/ttsflite.h b/utils/rbutilqt/base/ttsflite.h similarity index 100% rename from rbutil/rbutilqt/base/ttsflite.h rename to utils/rbutilqt/base/ttsflite.h diff --git a/rbutil/rbutilqt/base/ttsmimic.h b/utils/rbutilqt/base/ttsmimic.h similarity index 100% rename from rbutil/rbutilqt/base/ttsmimic.h rename to utils/rbutilqt/base/ttsmimic.h diff --git a/rbutil/rbutilqt/base/ttsmssp.h b/utils/rbutilqt/base/ttsmssp.h similarity index 100% rename from rbutil/rbutilqt/base/ttsmssp.h rename to utils/rbutilqt/base/ttsmssp.h diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/utils/rbutilqt/base/ttssapi.cpp similarity index 100% rename from rbutil/rbutilqt/base/ttssapi.cpp rename to utils/rbutilqt/base/ttssapi.cpp diff --git a/rbutil/rbutilqt/base/ttssapi.h b/utils/rbutilqt/base/ttssapi.h similarity index 100% rename from rbutil/rbutilqt/base/ttssapi.h rename to utils/rbutilqt/base/ttssapi.h diff --git a/rbutil/rbutilqt/base/ttssapi4.h b/utils/rbutilqt/base/ttssapi4.h similarity index 100% rename from rbutil/rbutilqt/base/ttssapi4.h rename to utils/rbutilqt/base/ttssapi4.h diff --git a/rbutil/rbutilqt/base/ttsswift.h b/utils/rbutilqt/base/ttsswift.h similarity index 100% rename from rbutil/rbutilqt/base/ttsswift.h rename to utils/rbutilqt/base/ttsswift.h diff --git a/rbutil/rbutilqt/base/uninstall.cpp b/utils/rbutilqt/base/uninstall.cpp similarity index 100% rename from rbutil/rbutilqt/base/uninstall.cpp rename to utils/rbutilqt/base/uninstall.cpp diff --git a/rbutil/rbutilqt/base/uninstall.h b/utils/rbutilqt/base/uninstall.h similarity index 100% rename from rbutil/rbutilqt/base/uninstall.h rename to utils/rbutilqt/base/uninstall.h diff --git a/rbutil/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp similarity index 100% rename from rbutil/rbutilqt/base/utils.cpp rename to utils/rbutilqt/base/utils.cpp diff --git a/rbutil/rbutilqt/base/utils.h b/utils/rbutilqt/base/utils.h similarity index 100% rename from rbutil/rbutilqt/base/utils.h rename to utils/rbutilqt/base/utils.h diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp similarity index 100% rename from rbutil/rbutilqt/base/voicefile.cpp rename to utils/rbutilqt/base/voicefile.cpp diff --git a/rbutil/rbutilqt/base/voicefile.h b/utils/rbutilqt/base/voicefile.h similarity index 100% rename from rbutil/rbutilqt/base/voicefile.h rename to utils/rbutilqt/base/voicefile.h diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp similarity index 100% rename from rbutil/rbutilqt/base/zipinstaller.cpp rename to utils/rbutilqt/base/zipinstaller.cpp diff --git a/rbutil/rbutilqt/base/zipinstaller.h b/utils/rbutilqt/base/zipinstaller.h similarity index 100% rename from rbutil/rbutilqt/base/zipinstaller.h rename to utils/rbutilqt/base/zipinstaller.h diff --git a/rbutil/rbutilqt/base/ziputil.cpp b/utils/rbutilqt/base/ziputil.cpp similarity index 100% rename from rbutil/rbutilqt/base/ziputil.cpp rename to utils/rbutilqt/base/ziputil.cpp diff --git a/rbutil/rbutilqt/base/ziputil.h b/utils/rbutilqt/base/ziputil.h similarity index 100% rename from rbutil/rbutilqt/base/ziputil.h rename to utils/rbutilqt/base/ziputil.h diff --git a/rbutil/rbutilqt/changelog.txt b/utils/rbutilqt/changelog.txt similarity index 100% rename from rbutil/rbutilqt/changelog.txt rename to utils/rbutilqt/changelog.txt diff --git a/rbutil/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp similarity index 100% rename from rbutil/rbutilqt/configure.cpp rename to utils/rbutilqt/configure.cpp diff --git a/rbutil/rbutilqt/configure.h b/utils/rbutilqt/configure.h similarity index 100% rename from rbutil/rbutilqt/configure.h rename to utils/rbutilqt/configure.h diff --git a/rbutil/rbutilqt/configurefrm.ui b/utils/rbutilqt/configurefrm.ui similarity index 100% rename from rbutil/rbutilqt/configurefrm.ui rename to utils/rbutilqt/configurefrm.ui diff --git a/rbutil/rbutilqt/createvoicefrm.ui b/utils/rbutilqt/createvoicefrm.ui similarity index 100% rename from rbutil/rbutilqt/createvoicefrm.ui rename to utils/rbutilqt/createvoicefrm.ui diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/utils/rbutilqt/createvoicewindow.cpp similarity index 100% rename from rbutil/rbutilqt/createvoicewindow.cpp rename to utils/rbutilqt/createvoicewindow.cpp diff --git a/rbutil/rbutilqt/createvoicewindow.h b/utils/rbutilqt/createvoicewindow.h similarity index 100% rename from rbutil/rbutilqt/createvoicewindow.h rename to utils/rbutilqt/createvoicewindow.h diff --git a/rbutil/rbutilqt/dmgbuild.cfg b/utils/rbutilqt/dmgbuild.cfg similarity index 100% rename from rbutil/rbutilqt/dmgbuild.cfg rename to utils/rbutilqt/dmgbuild.cfg diff --git a/rbutil/rbutilqt/encttscfggui.cpp b/utils/rbutilqt/encttscfggui.cpp similarity index 100% rename from rbutil/rbutilqt/encttscfggui.cpp rename to utils/rbutilqt/encttscfggui.cpp diff --git a/rbutil/rbutilqt/encttscfggui.h b/utils/rbutilqt/encttscfggui.h similarity index 100% rename from rbutil/rbutilqt/encttscfggui.h rename to utils/rbutilqt/encttscfggui.h diff --git a/rbutil/rbutilqt/gui/backupdialog.cpp b/utils/rbutilqt/gui/backupdialog.cpp similarity index 100% rename from rbutil/rbutilqt/gui/backupdialog.cpp rename to utils/rbutilqt/gui/backupdialog.cpp diff --git a/rbutil/rbutilqt/gui/backupdialog.h b/utils/rbutilqt/gui/backupdialog.h similarity index 100% rename from rbutil/rbutilqt/gui/backupdialog.h rename to utils/rbutilqt/gui/backupdialog.h diff --git a/rbutil/rbutilqt/gui/backupdialogfrm.ui b/utils/rbutilqt/gui/backupdialogfrm.ui similarity index 100% rename from rbutil/rbutilqt/gui/backupdialogfrm.ui rename to utils/rbutilqt/gui/backupdialogfrm.ui diff --git a/rbutil/rbutilqt/gui/changelog.cpp b/utils/rbutilqt/gui/changelog.cpp similarity index 100% rename from rbutil/rbutilqt/gui/changelog.cpp rename to utils/rbutilqt/gui/changelog.cpp diff --git a/rbutil/rbutilqt/gui/changelog.h b/utils/rbutilqt/gui/changelog.h similarity index 100% rename from rbutil/rbutilqt/gui/changelog.h rename to utils/rbutilqt/gui/changelog.h diff --git a/rbutil/rbutilqt/gui/changelogfrm.ui b/utils/rbutilqt/gui/changelogfrm.ui similarity index 100% rename from rbutil/rbutilqt/gui/changelogfrm.ui rename to utils/rbutilqt/gui/changelogfrm.ui diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp b/utils/rbutilqt/gui/comboboxviewdelegate.cpp similarity index 100% rename from rbutil/rbutilqt/gui/comboboxviewdelegate.cpp rename to utils/rbutilqt/gui/comboboxviewdelegate.cpp diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.h b/utils/rbutilqt/gui/comboboxviewdelegate.h similarity index 100% rename from rbutil/rbutilqt/gui/comboboxviewdelegate.h rename to utils/rbutilqt/gui/comboboxviewdelegate.h diff --git a/rbutil/rbutilqt/gui/infowidget.cpp b/utils/rbutilqt/gui/infowidget.cpp similarity index 100% rename from rbutil/rbutilqt/gui/infowidget.cpp rename to utils/rbutilqt/gui/infowidget.cpp diff --git a/rbutil/rbutilqt/gui/infowidget.h b/utils/rbutilqt/gui/infowidget.h similarity index 100% rename from rbutil/rbutilqt/gui/infowidget.h rename to utils/rbutilqt/gui/infowidget.h diff --git a/rbutil/rbutilqt/gui/infowidgetfrm.ui b/utils/rbutilqt/gui/infowidgetfrm.ui similarity index 100% rename from rbutil/rbutilqt/gui/infowidgetfrm.ui rename to utils/rbutilqt/gui/infowidgetfrm.ui diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp similarity index 100% rename from rbutil/rbutilqt/gui/selectiveinstallwidget.cpp rename to utils/rbutilqt/gui/selectiveinstallwidget.cpp diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.h b/utils/rbutilqt/gui/selectiveinstallwidget.h similarity index 100% rename from rbutil/rbutilqt/gui/selectiveinstallwidget.h rename to utils/rbutilqt/gui/selectiveinstallwidget.h diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui b/utils/rbutilqt/gui/selectiveinstallwidgetfrm.ui similarity index 100% rename from rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui rename to utils/rbutilqt/gui/selectiveinstallwidgetfrm.ui diff --git a/rbutil/rbutilqt/icons/audio-input-microphone.svg b/utils/rbutilqt/icons/audio-input-microphone.svg similarity index 100% rename from rbutil/rbutilqt/icons/audio-input-microphone.svg rename to utils/rbutilqt/icons/audio-input-microphone.svg diff --git a/rbutil/rbutilqt/icons/audio-volume-high.svg b/utils/rbutilqt/icons/audio-volume-high.svg similarity index 100% rename from rbutil/rbutilqt/icons/audio-volume-high.svg rename to utils/rbutilqt/icons/audio-volume-high.svg diff --git a/rbutil/rbutilqt/icons/dialog-error.svg b/utils/rbutilqt/icons/dialog-error.svg similarity index 100% rename from rbutil/rbutilqt/icons/dialog-error.svg rename to utils/rbutilqt/icons/dialog-error.svg diff --git a/rbutil/rbutilqt/icons/dialog-information.svg b/utils/rbutilqt/icons/dialog-information.svg similarity index 100% rename from rbutil/rbutilqt/icons/dialog-information.svg rename to utils/rbutilqt/icons/dialog-information.svg diff --git a/rbutil/rbutilqt/icons/dialog-warning.svg b/utils/rbutilqt/icons/dialog-warning.svg similarity index 100% rename from rbutil/rbutilqt/icons/dialog-warning.svg rename to utils/rbutilqt/icons/dialog-warning.svg diff --git a/rbutil/rbutilqt/icons/document-save.svg b/utils/rbutilqt/icons/document-save.svg similarity index 100% rename from rbutil/rbutilqt/icons/document-save.svg rename to utils/rbutilqt/icons/document-save.svg diff --git a/rbutil/rbutilqt/icons/edit-clear.svg b/utils/rbutilqt/icons/edit-clear.svg similarity index 100% rename from rbutil/rbutilqt/icons/edit-clear.svg rename to utils/rbutilqt/icons/edit-clear.svg diff --git a/rbutil/rbutilqt/icons/edit-find.svg b/utils/rbutilqt/icons/edit-find.svg similarity index 100% rename from rbutil/rbutilqt/icons/edit-find.svg rename to utils/rbutilqt/icons/edit-find.svg diff --git a/rbutil/rbutilqt/icons/go-next.svg b/utils/rbutilqt/icons/go-next.svg similarity index 100% rename from rbutil/rbutilqt/icons/go-next.svg rename to utils/rbutilqt/icons/go-next.svg diff --git a/rbutil/rbutilqt/icons/input-gaming.svg b/utils/rbutilqt/icons/input-gaming.svg similarity index 100% rename from rbutil/rbutilqt/icons/input-gaming.svg rename to utils/rbutilqt/icons/input-gaming.svg diff --git a/rbutil/rbutilqt/icons/media-eject.svg b/utils/rbutilqt/icons/media-eject.svg similarity index 100% rename from rbutil/rbutilqt/icons/media-eject.svg rename to utils/rbutilqt/icons/media-eject.svg diff --git a/rbutil/rbutilqt/icons/multimedia-player.svg b/utils/rbutilqt/icons/multimedia-player.svg similarity index 100% rename from rbutil/rbutilqt/icons/multimedia-player.svg rename to utils/rbutilqt/icons/multimedia-player.svg diff --git a/rbutil/rbutilqt/icons/network-idle.svg b/utils/rbutilqt/icons/network-idle.svg similarity index 100% rename from rbutil/rbutilqt/icons/network-idle.svg rename to utils/rbutilqt/icons/network-idle.svg diff --git a/rbutil/rbutilqt/icons/package-x-generic.svg b/utils/rbutilqt/icons/package-x-generic.svg similarity index 100% rename from rbutil/rbutilqt/icons/package-x-generic.svg rename to utils/rbutilqt/icons/package-x-generic.svg diff --git a/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png b/utils/rbutilqt/icons/players/archosfmrecorder-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/archosfmrecorder-small.png rename to utils/rbutilqt/icons/players/archosfmrecorder-small.png diff --git a/rbutil/rbutilqt/icons/players/archosondiofm-small.png b/utils/rbutilqt/icons/players/archosondiofm-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/archosondiofm-small.png rename to utils/rbutilqt/icons/players/archosondiofm-small.png diff --git a/rbutil/rbutilqt/icons/players/archosondiosp-small.png b/utils/rbutilqt/icons/players/archosondiosp-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/archosondiosp-small.png rename to utils/rbutilqt/icons/players/archosondiosp-small.png diff --git a/rbutil/rbutilqt/icons/players/archosplayer-small.png b/utils/rbutilqt/icons/players/archosplayer-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/archosplayer-small.png rename to utils/rbutilqt/icons/players/archosplayer-small.png diff --git a/rbutil/rbutilqt/icons/players/archosrecorder-small.png b/utils/rbutilqt/icons/players/archosrecorder-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/archosrecorder-small.png rename to utils/rbutilqt/icons/players/archosrecorder-small.png diff --git a/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png b/utils/rbutilqt/icons/players/archosrecorderv2-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/archosrecorderv2-small.png rename to utils/rbutilqt/icons/players/archosrecorderv2-small.png diff --git a/rbutil/rbutilqt/icons/players/cowond2-small.png b/utils/rbutilqt/icons/players/cowond2-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/cowond2-small.png rename to utils/rbutilqt/icons/players/cowond2-small.png diff --git a/rbutil/rbutilqt/icons/players/fonts-small.png b/utils/rbutilqt/icons/players/fonts-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/fonts-small.png rename to utils/rbutilqt/icons/players/fonts-small.png diff --git a/rbutil/rbutilqt/icons/players/gigabeatfx-small.png b/utils/rbutilqt/icons/players/gigabeatfx-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/gigabeatfx-small.png rename to utils/rbutilqt/icons/players/gigabeatfx-small.png diff --git a/rbutil/rbutilqt/icons/players/gigabeats-small.png b/utils/rbutilqt/icons/players/gigabeats-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/gigabeats-small.png rename to utils/rbutilqt/icons/players/gigabeats-small.png diff --git a/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png b/utils/rbutilqt/icons/players/gogearhdd1630-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/gogearhdd1630-small.png rename to utils/rbutilqt/icons/players/gogearhdd1630-small.png diff --git a/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png b/utils/rbutilqt/icons/players/gogearhdd6330-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/gogearhdd6330-small.png rename to utils/rbutilqt/icons/players/gogearhdd6330-small.png diff --git a/rbutil/rbutilqt/icons/players/gogearsa9200-small.png b/utils/rbutilqt/icons/players/gogearsa9200-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/gogearsa9200-small.png rename to utils/rbutilqt/icons/players/gogearsa9200-small.png diff --git a/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png b/utils/rbutilqt/icons/players/hifimanhm60x-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/hifimanhm60x-small.png rename to utils/rbutilqt/icons/players/hifimanhm60x-small.png diff --git a/rbutil/rbutilqt/icons/players/hifimanhm801-small.png b/utils/rbutilqt/icons/players/hifimanhm801-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/hifimanhm801-small.png rename to utils/rbutilqt/icons/players/hifimanhm801-small.png diff --git a/rbutil/rbutilqt/icons/players/iaudiom3-small.png b/utils/rbutilqt/icons/players/iaudiom3-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iaudiom3-small.png rename to utils/rbutilqt/icons/players/iaudiom3-small.png diff --git a/rbutil/rbutilqt/icons/players/iaudiom5-small.png b/utils/rbutilqt/icons/players/iaudiom5-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iaudiom5-small.png rename to utils/rbutilqt/icons/players/iaudiom5-small.png diff --git a/rbutil/rbutilqt/icons/players/iaudiox5-small.png b/utils/rbutilqt/icons/players/iaudiox5-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iaudiox5-small.png rename to utils/rbutilqt/icons/players/iaudiox5-small.png diff --git a/rbutil/rbutilqt/icons/players/ipod1g2g-small.png b/utils/rbutilqt/icons/players/ipod1g2g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipod1g2g-small.png rename to utils/rbutilqt/icons/players/ipod1g2g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipod3g-small.png b/utils/rbutilqt/icons/players/ipod3g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipod3g-small.png rename to utils/rbutilqt/icons/players/ipod3g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipod4g-small.png b/utils/rbutilqt/icons/players/ipod4g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipod4g-small.png rename to utils/rbutilqt/icons/players/ipod4g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipod6g-small.png b/utils/rbutilqt/icons/players/ipod6g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipod6g-small.png rename to utils/rbutilqt/icons/players/ipod6g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipodcolor-small.png b/utils/rbutilqt/icons/players/ipodcolor-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipodcolor-small.png rename to utils/rbutilqt/icons/players/ipodcolor-small.png diff --git a/rbutil/rbutilqt/icons/players/ipodmini1g-small.png b/utils/rbutilqt/icons/players/ipodmini1g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipodmini1g-small.png rename to utils/rbutilqt/icons/players/ipodmini1g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipodnano1g-small.png b/utils/rbutilqt/icons/players/ipodnano1g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipodnano1g-small.png rename to utils/rbutilqt/icons/players/ipodnano1g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipodnano2g-small.png b/utils/rbutilqt/icons/players/ipodnano2g-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipodnano2g-small.png rename to utils/rbutilqt/icons/players/ipodnano2g-small.png diff --git a/rbutil/rbutilqt/icons/players/ipodvideo-small.png b/utils/rbutilqt/icons/players/ipodvideo-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/ipodvideo-small.png rename to utils/rbutilqt/icons/players/ipodvideo-small.png diff --git a/rbutil/rbutilqt/icons/players/iriverh10-small.png b/utils/rbutilqt/icons/players/iriverh10-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iriverh10-small.png rename to utils/rbutilqt/icons/players/iriverh10-small.png diff --git a/rbutil/rbutilqt/icons/players/iriverh100-small.png b/utils/rbutilqt/icons/players/iriverh100-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iriverh100-small.png rename to utils/rbutilqt/icons/players/iriverh100-small.png diff --git a/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png b/utils/rbutilqt/icons/players/iriverh10_5gb-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png rename to utils/rbutilqt/icons/players/iriverh10_5gb-small.png diff --git a/rbutil/rbutilqt/icons/players/iriverh300-small.png b/utils/rbutilqt/icons/players/iriverh300-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/iriverh300-small.png rename to utils/rbutilqt/icons/players/iriverh300-small.png diff --git a/rbutil/rbutilqt/icons/players/mpiohd200-small.png b/utils/rbutilqt/icons/players/mpiohd200-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/mpiohd200-small.png rename to utils/rbutilqt/icons/players/mpiohd200-small.png diff --git a/rbutil/rbutilqt/icons/players/mpiohd300-small.png b/utils/rbutilqt/icons/players/mpiohd300-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/mpiohd300-small.png rename to utils/rbutilqt/icons/players/mpiohd300-small.png diff --git a/rbutil/rbutilqt/icons/players/mrobe100-small.png b/utils/rbutilqt/icons/players/mrobe100-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/mrobe100-small.png rename to utils/rbutilqt/icons/players/mrobe100-small.png diff --git a/rbutil/rbutilqt/icons/players/mrobe500-small.png b/utils/rbutilqt/icons/players/mrobe500-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/mrobe500-small.png rename to utils/rbutilqt/icons/players/mrobe500-small.png diff --git a/rbutil/rbutilqt/icons/players/samsungyh820-small.png b/utils/rbutilqt/icons/players/samsungyh820-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/samsungyh820-small.png rename to utils/rbutilqt/icons/players/samsungyh820-small.png diff --git a/rbutil/rbutilqt/icons/players/samsungyh920-small.png b/utils/rbutilqt/icons/players/samsungyh920-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/samsungyh920-small.png rename to utils/rbutilqt/icons/players/samsungyh920-small.png diff --git a/rbutil/rbutilqt/icons/players/samsungyh925-small.png b/utils/rbutilqt/icons/players/samsungyh925-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/samsungyh925-small.png rename to utils/rbutilqt/icons/players/samsungyh925-small.png diff --git a/rbutil/rbutilqt/icons/players/samsungypr0-small.png b/utils/rbutilqt/icons/players/samsungypr0-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/samsungypr0-small.png rename to utils/rbutilqt/icons/players/samsungypr0-small.png diff --git a/rbutil/rbutilqt/icons/players/sansac200-small.png b/utils/rbutilqt/icons/players/sansac200-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansac200-small.png rename to utils/rbutilqt/icons/players/sansac200-small.png diff --git a/rbutil/rbutilqt/icons/players/sansaclip-small.png b/utils/rbutilqt/icons/players/sansaclip-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansaclip-small.png rename to utils/rbutilqt/icons/players/sansaclip-small.png diff --git a/rbutil/rbutilqt/icons/players/sansaclipplus-small.png b/utils/rbutilqt/icons/players/sansaclipplus-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansaclipplus-small.png rename to utils/rbutilqt/icons/players/sansaclipplus-small.png diff --git a/rbutil/rbutilqt/icons/players/sansaclipzip-small.png b/utils/rbutilqt/icons/players/sansaclipzip-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansaclipzip-small.png rename to utils/rbutilqt/icons/players/sansaclipzip-small.png diff --git a/rbutil/rbutilqt/icons/players/sansaconnect-small.png b/utils/rbutilqt/icons/players/sansaconnect-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansaconnect-small.png rename to utils/rbutilqt/icons/players/sansaconnect-small.png diff --git a/rbutil/rbutilqt/icons/players/sansae200-small.png b/utils/rbutilqt/icons/players/sansae200-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansae200-small.png rename to utils/rbutilqt/icons/players/sansae200-small.png diff --git a/rbutil/rbutilqt/icons/players/sansafuze-small.png b/utils/rbutilqt/icons/players/sansafuze-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansafuze-small.png rename to utils/rbutilqt/icons/players/sansafuze-small.png diff --git a/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png b/utils/rbutilqt/icons/players/sansafuzeplus-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/sansafuzeplus-small.png rename to utils/rbutilqt/icons/players/sansafuzeplus-small.png diff --git a/rbutil/rbutilqt/icons/players/source-small.png b/utils/rbutilqt/icons/players/source-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/source-small.png rename to utils/rbutilqt/icons/players/source-small.png diff --git a/rbutil/rbutilqt/icons/players/vibe500-small.png b/utils/rbutilqt/icons/players/vibe500-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/vibe500-small.png rename to utils/rbutilqt/icons/players/vibe500-small.png diff --git a/rbutil/rbutilqt/icons/players/vx747-small.png b/utils/rbutilqt/icons/players/vx747-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/vx747-small.png rename to utils/rbutilqt/icons/players/vx747-small.png diff --git a/rbutil/rbutilqt/icons/players/vx777-small.png b/utils/rbutilqt/icons/players/vx777-small.png similarity index 100% rename from rbutil/rbutilqt/icons/players/vx777-small.png rename to utils/rbutilqt/icons/players/vx777-small.png diff --git a/rbutil/rbutilqt/icons/preferences-desktop-font.svg b/utils/rbutilqt/icons/preferences-desktop-font.svg similarity index 100% rename from rbutil/rbutilqt/icons/preferences-desktop-font.svg rename to utils/rbutilqt/icons/preferences-desktop-font.svg diff --git a/rbutil/rbutilqt/icons/preferences-desktop-locale.svg b/utils/rbutilqt/icons/preferences-desktop-locale.svg similarity index 100% rename from rbutil/rbutilqt/icons/preferences-desktop-locale.svg rename to utils/rbutilqt/icons/preferences-desktop-locale.svg diff --git a/rbutil/rbutilqt/icons/preferences-desktop-theme.svg b/utils/rbutilqt/icons/preferences-desktop-theme.svg similarity index 100% rename from rbutil/rbutilqt/icons/preferences-desktop-theme.svg rename to utils/rbutilqt/icons/preferences-desktop-theme.svg diff --git a/rbutil/rbutilqt/icons/preferences-system.svg b/utils/rbutilqt/icons/preferences-system.svg similarity index 100% rename from rbutil/rbutilqt/icons/preferences-system.svg rename to utils/rbutilqt/icons/preferences-system.svg diff --git a/rbutil/rbutilqt/icons/process-stop.svg b/utils/rbutilqt/icons/process-stop.svg similarity index 100% rename from rbutil/rbutilqt/icons/process-stop.svg rename to utils/rbutilqt/icons/process-stop.svg diff --git a/rbutil/rbutilqt/icons/rbutilqt.icns b/utils/rbutilqt/icons/rbutilqt.icns similarity index 100% rename from rbutil/rbutilqt/icons/rbutilqt.icns rename to utils/rbutilqt/icons/rbutilqt.icns diff --git a/rbutil/rbutilqt/icons/rockbox.ico b/utils/rbutilqt/icons/rockbox.ico similarity index 100% rename from rbutil/rbutilqt/icons/rockbox.ico rename to utils/rbutilqt/icons/rockbox.ico diff --git a/rbutil/rbutilqt/icons/system-installer.svg b/utils/rbutilqt/icons/system-installer.svg similarity index 100% rename from rbutil/rbutilqt/icons/system-installer.svg rename to utils/rbutilqt/icons/system-installer.svg diff --git a/rbutil/rbutilqt/icons/system-search.svg b/utils/rbutilqt/icons/system-search.svg similarity index 100% rename from rbutil/rbutilqt/icons/system-search.svg rename to utils/rbutilqt/icons/system-search.svg diff --git a/rbutil/rbutilqt/icons/user-trash-full.svg b/utils/rbutilqt/icons/user-trash-full.svg similarity index 100% rename from rbutil/rbutilqt/icons/user-trash-full.svg rename to utils/rbutilqt/icons/user-trash-full.svg diff --git a/rbutil/rbutilqt/icons/view-refresh.svg b/utils/rbutilqt/icons/view-refresh.svg similarity index 100% rename from rbutil/rbutilqt/icons/view-refresh.svg rename to utils/rbutilqt/icons/view-refresh.svg diff --git a/rbutil/rbutilqt/icons/wizard.jpg b/utils/rbutilqt/icons/wizard.jpg similarity index 100% rename from rbutil/rbutilqt/icons/wizard.jpg rename to utils/rbutilqt/icons/wizard.jpg diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/utils/rbutilqt/installtalkfrm.ui similarity index 100% rename from rbutil/rbutilqt/installtalkfrm.ui rename to utils/rbutilqt/installtalkfrm.ui diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/utils/rbutilqt/installtalkwindow.cpp similarity index 100% rename from rbutil/rbutilqt/installtalkwindow.cpp rename to utils/rbutilqt/installtalkwindow.cpp diff --git a/rbutil/rbutilqt/installtalkwindow.h b/utils/rbutilqt/installtalkwindow.h similarity index 100% rename from rbutil/rbutilqt/installtalkwindow.h rename to utils/rbutilqt/installtalkwindow.h diff --git a/rbutil/rbutilqt/irivertools/h100sums.h b/utils/rbutilqt/irivertools/h100sums.h similarity index 100% rename from rbutil/rbutilqt/irivertools/h100sums.h rename to utils/rbutilqt/irivertools/h100sums.h diff --git a/rbutil/rbutilqt/irivertools/h120sums.h b/utils/rbutilqt/irivertools/h120sums.h similarity index 100% rename from rbutil/rbutilqt/irivertools/h120sums.h rename to utils/rbutilqt/irivertools/h120sums.h diff --git a/rbutil/rbutilqt/irivertools/h300sums.h b/utils/rbutilqt/irivertools/h300sums.h similarity index 100% rename from rbutil/rbutilqt/irivertools/h300sums.h rename to utils/rbutilqt/irivertools/h300sums.h diff --git a/rbutil/rbutilqt/irivertools/mksums.pl b/utils/rbutilqt/irivertools/mksums.pl similarity index 100% rename from rbutil/rbutilqt/irivertools/mksums.pl rename to utils/rbutilqt/irivertools/mksums.pl diff --git a/rbutil/rbutilqt/lame/lame.h b/utils/rbutilqt/lame/lame.h similarity index 100% rename from rbutil/rbutilqt/lame/lame.h rename to utils/rbutilqt/lame/lame.h diff --git a/rbutil/rbutilqt/lang/rbutil_cs.ts b/utils/rbutilqt/lang/rbutil_cs.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_cs.ts rename to utils/rbutilqt/lang/rbutil_cs.ts diff --git a/rbutil/rbutilqt/lang/rbutil_de.ts b/utils/rbutilqt/lang/rbutil_de.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_de.ts rename to utils/rbutilqt/lang/rbutil_de.ts diff --git a/rbutil/rbutilqt/lang/rbutil_fi.ts b/utils/rbutilqt/lang/rbutil_fi.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_fi.ts rename to utils/rbutilqt/lang/rbutil_fi.ts diff --git a/rbutil/rbutilqt/lang/rbutil_fr.ts b/utils/rbutilqt/lang/rbutil_fr.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_fr.ts rename to utils/rbutilqt/lang/rbutil_fr.ts diff --git a/rbutil/rbutilqt/lang/rbutil_gr.ts b/utils/rbutilqt/lang/rbutil_gr.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_gr.ts rename to utils/rbutilqt/lang/rbutil_gr.ts diff --git a/rbutil/rbutilqt/lang/rbutil_he.ts b/utils/rbutilqt/lang/rbutil_he.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_he.ts rename to utils/rbutilqt/lang/rbutil_he.ts diff --git a/rbutil/rbutilqt/lang/rbutil_it.ts b/utils/rbutilqt/lang/rbutil_it.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_it.ts rename to utils/rbutilqt/lang/rbutil_it.ts diff --git a/rbutil/rbutilqt/lang/rbutil_ja.ts b/utils/rbutilqt/lang/rbutil_ja.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_ja.ts rename to utils/rbutilqt/lang/rbutil_ja.ts diff --git a/rbutil/rbutilqt/lang/rbutil_nl.ts b/utils/rbutilqt/lang/rbutil_nl.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_nl.ts rename to utils/rbutilqt/lang/rbutil_nl.ts diff --git a/rbutil/rbutilqt/lang/rbutil_pl.ts b/utils/rbutilqt/lang/rbutil_pl.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_pl.ts rename to utils/rbutilqt/lang/rbutil_pl.ts diff --git a/rbutil/rbutilqt/lang/rbutil_pt.ts b/utils/rbutilqt/lang/rbutil_pt.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_pt.ts rename to utils/rbutilqt/lang/rbutil_pt.ts diff --git a/rbutil/rbutilqt/lang/rbutil_pt_BR.ts b/utils/rbutilqt/lang/rbutil_pt_BR.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_pt_BR.ts rename to utils/rbutilqt/lang/rbutil_pt_BR.ts diff --git a/rbutil/rbutilqt/lang/rbutil_ru.ts b/utils/rbutilqt/lang/rbutil_ru.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_ru.ts rename to utils/rbutilqt/lang/rbutil_ru.ts diff --git a/rbutil/rbutilqt/lang/rbutil_tr.ts b/utils/rbutilqt/lang/rbutil_tr.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_tr.ts rename to utils/rbutilqt/lang/rbutil_tr.ts diff --git a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts b/utils/rbutilqt/lang/rbutil_zh_CN.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_zh_CN.ts rename to utils/rbutilqt/lang/rbutil_zh_CN.ts diff --git a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts b/utils/rbutilqt/lang/rbutil_zh_TW.ts similarity index 100% rename from rbutil/rbutilqt/lang/rbutil_zh_TW.ts rename to utils/rbutilqt/lang/rbutil_zh_TW.ts diff --git a/rbutil/rbutilqt/langstats.py b/utils/rbutilqt/langstats.py similarity index 100% rename from rbutil/rbutilqt/langstats.py rename to utils/rbutilqt/langstats.py diff --git a/rbutil/rbutilqt/logger/LICENSE.LGPL b/utils/rbutilqt/logger/LICENSE.LGPL similarity index 100% rename from rbutil/rbutilqt/logger/LICENSE.LGPL rename to utils/rbutilqt/logger/LICENSE.LGPL diff --git a/rbutil/rbutilqt/logger/README.ROCKBOX b/utils/rbutilqt/logger/README.ROCKBOX similarity index 100% rename from rbutil/rbutilqt/logger/README.ROCKBOX rename to utils/rbutilqt/logger/README.ROCKBOX diff --git a/rbutil/rbutilqt/logger/include/AbstractAppender.h b/utils/rbutilqt/logger/include/AbstractAppender.h similarity index 100% rename from rbutil/rbutilqt/logger/include/AbstractAppender.h rename to utils/rbutilqt/logger/include/AbstractAppender.h diff --git a/rbutil/rbutilqt/logger/include/AbstractStringAppender.h b/utils/rbutilqt/logger/include/AbstractStringAppender.h similarity index 100% rename from rbutil/rbutilqt/logger/include/AbstractStringAppender.h rename to utils/rbutilqt/logger/include/AbstractStringAppender.h diff --git a/rbutil/rbutilqt/logger/include/ConsoleAppender.h b/utils/rbutilqt/logger/include/ConsoleAppender.h similarity index 100% rename from rbutil/rbutilqt/logger/include/ConsoleAppender.h rename to utils/rbutilqt/logger/include/ConsoleAppender.h diff --git a/rbutil/rbutilqt/logger/include/CuteLogger_global.h b/utils/rbutilqt/logger/include/CuteLogger_global.h similarity index 100% rename from rbutil/rbutilqt/logger/include/CuteLogger_global.h rename to utils/rbutilqt/logger/include/CuteLogger_global.h diff --git a/rbutil/rbutilqt/logger/include/FileAppender.h b/utils/rbutilqt/logger/include/FileAppender.h similarity index 100% rename from rbutil/rbutilqt/logger/include/FileAppender.h rename to utils/rbutilqt/logger/include/FileAppender.h diff --git a/rbutil/rbutilqt/logger/include/Logger.h b/utils/rbutilqt/logger/include/Logger.h similarity index 100% rename from rbutil/rbutilqt/logger/include/Logger.h rename to utils/rbutilqt/logger/include/Logger.h diff --git a/rbutil/rbutilqt/logger/include/OutputDebugAppender.h b/utils/rbutilqt/logger/include/OutputDebugAppender.h similarity index 100% rename from rbutil/rbutilqt/logger/include/OutputDebugAppender.h rename to utils/rbutilqt/logger/include/OutputDebugAppender.h diff --git a/rbutil/rbutilqt/logger/logger.pri b/utils/rbutilqt/logger/logger.pri similarity index 100% rename from rbutil/rbutilqt/logger/logger.pri rename to utils/rbutilqt/logger/logger.pri diff --git a/rbutil/rbutilqt/logger/src/AbstractAppender.cpp b/utils/rbutilqt/logger/src/AbstractAppender.cpp similarity index 100% rename from rbutil/rbutilqt/logger/src/AbstractAppender.cpp rename to utils/rbutilqt/logger/src/AbstractAppender.cpp diff --git a/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp b/utils/rbutilqt/logger/src/AbstractStringAppender.cpp similarity index 100% rename from rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp rename to utils/rbutilqt/logger/src/AbstractStringAppender.cpp diff --git a/rbutil/rbutilqt/logger/src/ConsoleAppender.cpp b/utils/rbutilqt/logger/src/ConsoleAppender.cpp similarity index 100% rename from rbutil/rbutilqt/logger/src/ConsoleAppender.cpp rename to utils/rbutilqt/logger/src/ConsoleAppender.cpp diff --git a/rbutil/rbutilqt/logger/src/FileAppender.cpp b/utils/rbutilqt/logger/src/FileAppender.cpp similarity index 100% rename from rbutil/rbutilqt/logger/src/FileAppender.cpp rename to utils/rbutilqt/logger/src/FileAppender.cpp diff --git a/rbutil/rbutilqt/logger/src/Logger.cpp b/utils/rbutilqt/logger/src/Logger.cpp similarity index 100% rename from rbutil/rbutilqt/logger/src/Logger.cpp rename to utils/rbutilqt/logger/src/Logger.cpp diff --git a/rbutil/rbutilqt/logger/src/OutputDebugAppender.cpp b/utils/rbutilqt/logger/src/OutputDebugAppender.cpp similarity index 100% rename from rbutil/rbutilqt/logger/src/OutputDebugAppender.cpp rename to utils/rbutilqt/logger/src/OutputDebugAppender.cpp diff --git a/rbutil/rbutilqt/main.cpp b/utils/rbutilqt/main.cpp similarity index 100% rename from rbutil/rbutilqt/main.cpp rename to utils/rbutilqt/main.cpp diff --git a/rbutil/rbutilqt/mspack/COPYING.LIB b/utils/rbutilqt/mspack/COPYING.LIB similarity index 100% rename from rbutil/rbutilqt/mspack/COPYING.LIB rename to utils/rbutilqt/mspack/COPYING.LIB diff --git a/rbutil/rbutilqt/mspack/README.ROCKBOX b/utils/rbutilqt/mspack/README.ROCKBOX similarity index 100% rename from rbutil/rbutilqt/mspack/README.ROCKBOX rename to utils/rbutilqt/mspack/README.ROCKBOX diff --git a/rbutil/rbutilqt/mspack/cab.h b/utils/rbutilqt/mspack/cab.h similarity index 100% rename from rbutil/rbutilqt/mspack/cab.h rename to utils/rbutilqt/mspack/cab.h diff --git a/rbutil/rbutilqt/mspack/cabc.c b/utils/rbutilqt/mspack/cabc.c similarity index 100% rename from rbutil/rbutilqt/mspack/cabc.c rename to utils/rbutilqt/mspack/cabc.c diff --git a/rbutil/rbutilqt/mspack/cabd.c b/utils/rbutilqt/mspack/cabd.c similarity index 100% rename from rbutil/rbutilqt/mspack/cabd.c rename to utils/rbutilqt/mspack/cabd.c diff --git a/rbutil/rbutilqt/mspack/chm.h b/utils/rbutilqt/mspack/chm.h similarity index 100% rename from rbutil/rbutilqt/mspack/chm.h rename to utils/rbutilqt/mspack/chm.h diff --git a/rbutil/rbutilqt/mspack/chmc.c b/utils/rbutilqt/mspack/chmc.c similarity index 100% rename from rbutil/rbutilqt/mspack/chmc.c rename to utils/rbutilqt/mspack/chmc.c diff --git a/rbutil/rbutilqt/mspack/chmd.c b/utils/rbutilqt/mspack/chmd.c similarity index 100% rename from rbutil/rbutilqt/mspack/chmd.c rename to utils/rbutilqt/mspack/chmd.c diff --git a/rbutil/rbutilqt/mspack/des.h b/utils/rbutilqt/mspack/des.h similarity index 100% rename from rbutil/rbutilqt/mspack/des.h rename to utils/rbutilqt/mspack/des.h diff --git a/rbutil/rbutilqt/mspack/hlp.h b/utils/rbutilqt/mspack/hlp.h similarity index 100% rename from rbutil/rbutilqt/mspack/hlp.h rename to utils/rbutilqt/mspack/hlp.h diff --git a/rbutil/rbutilqt/mspack/hlpc.c b/utils/rbutilqt/mspack/hlpc.c similarity index 100% rename from rbutil/rbutilqt/mspack/hlpc.c rename to utils/rbutilqt/mspack/hlpc.c diff --git a/rbutil/rbutilqt/mspack/hlpd.c b/utils/rbutilqt/mspack/hlpd.c similarity index 100% rename from rbutil/rbutilqt/mspack/hlpd.c rename to utils/rbutilqt/mspack/hlpd.c diff --git a/rbutil/rbutilqt/mspack/kwaj.h b/utils/rbutilqt/mspack/kwaj.h similarity index 100% rename from rbutil/rbutilqt/mspack/kwaj.h rename to utils/rbutilqt/mspack/kwaj.h diff --git a/rbutil/rbutilqt/mspack/kwajc.c b/utils/rbutilqt/mspack/kwajc.c similarity index 100% rename from rbutil/rbutilqt/mspack/kwajc.c rename to utils/rbutilqt/mspack/kwajc.c diff --git a/rbutil/rbutilqt/mspack/kwajd.c b/utils/rbutilqt/mspack/kwajd.c similarity index 100% rename from rbutil/rbutilqt/mspack/kwajd.c rename to utils/rbutilqt/mspack/kwajd.c diff --git a/rbutil/rbutilqt/mspack/lit.h b/utils/rbutilqt/mspack/lit.h similarity index 100% rename from rbutil/rbutilqt/mspack/lit.h rename to utils/rbutilqt/mspack/lit.h diff --git a/rbutil/rbutilqt/mspack/litc.c b/utils/rbutilqt/mspack/litc.c similarity index 100% rename from rbutil/rbutilqt/mspack/litc.c rename to utils/rbutilqt/mspack/litc.c diff --git a/rbutil/rbutilqt/mspack/litd.c b/utils/rbutilqt/mspack/litd.c similarity index 100% rename from rbutil/rbutilqt/mspack/litd.c rename to utils/rbutilqt/mspack/litd.c diff --git a/rbutil/rbutilqt/mspack/lzss.h b/utils/rbutilqt/mspack/lzss.h similarity index 100% rename from rbutil/rbutilqt/mspack/lzss.h rename to utils/rbutilqt/mspack/lzss.h diff --git a/rbutil/rbutilqt/mspack/lzssd.c b/utils/rbutilqt/mspack/lzssd.c similarity index 100% rename from rbutil/rbutilqt/mspack/lzssd.c rename to utils/rbutilqt/mspack/lzssd.c diff --git a/rbutil/rbutilqt/mspack/lzx.h b/utils/rbutilqt/mspack/lzx.h similarity index 100% rename from rbutil/rbutilqt/mspack/lzx.h rename to utils/rbutilqt/mspack/lzx.h diff --git a/rbutil/rbutilqt/mspack/lzxc.c b/utils/rbutilqt/mspack/lzxc.c similarity index 100% rename from rbutil/rbutilqt/mspack/lzxc.c rename to utils/rbutilqt/mspack/lzxc.c diff --git a/rbutil/rbutilqt/mspack/lzxd.c b/utils/rbutilqt/mspack/lzxd.c similarity index 100% rename from rbutil/rbutilqt/mspack/lzxd.c rename to utils/rbutilqt/mspack/lzxd.c diff --git a/rbutil/rbutilqt/mspack/mspack.h b/utils/rbutilqt/mspack/mspack.h similarity index 100% rename from rbutil/rbutilqt/mspack/mspack.h rename to utils/rbutilqt/mspack/mspack.h diff --git a/rbutil/rbutilqt/mspack/mszip.h b/utils/rbutilqt/mspack/mszip.h similarity index 100% rename from rbutil/rbutilqt/mspack/mszip.h rename to utils/rbutilqt/mspack/mszip.h diff --git a/rbutil/rbutilqt/mspack/mszipc.c b/utils/rbutilqt/mspack/mszipc.c similarity index 100% rename from rbutil/rbutilqt/mspack/mszipc.c rename to utils/rbutilqt/mspack/mszipc.c diff --git a/rbutil/rbutilqt/mspack/mszipd.c b/utils/rbutilqt/mspack/mszipd.c similarity index 100% rename from rbutil/rbutilqt/mspack/mszipd.c rename to utils/rbutilqt/mspack/mszipd.c diff --git a/rbutil/rbutilqt/mspack/qtm.h b/utils/rbutilqt/mspack/qtm.h similarity index 100% rename from rbutil/rbutilqt/mspack/qtm.h rename to utils/rbutilqt/mspack/qtm.h diff --git a/rbutil/rbutilqt/mspack/qtmd.c b/utils/rbutilqt/mspack/qtmd.c similarity index 100% rename from rbutil/rbutilqt/mspack/qtmd.c rename to utils/rbutilqt/mspack/qtmd.c diff --git a/rbutil/rbutilqt/mspack/readbits.h b/utils/rbutilqt/mspack/readbits.h similarity index 100% rename from rbutil/rbutilqt/mspack/readbits.h rename to utils/rbutilqt/mspack/readbits.h diff --git a/rbutil/rbutilqt/mspack/readhuff.h b/utils/rbutilqt/mspack/readhuff.h similarity index 100% rename from rbutil/rbutilqt/mspack/readhuff.h rename to utils/rbutilqt/mspack/readhuff.h diff --git a/rbutil/rbutilqt/mspack/sha.h b/utils/rbutilqt/mspack/sha.h similarity index 100% rename from rbutil/rbutilqt/mspack/sha.h rename to utils/rbutilqt/mspack/sha.h diff --git a/rbutil/rbutilqt/mspack/system-mspack.c b/utils/rbutilqt/mspack/system-mspack.c similarity index 100% rename from rbutil/rbutilqt/mspack/system-mspack.c rename to utils/rbutilqt/mspack/system-mspack.c diff --git a/rbutil/rbutilqt/mspack/system-mspack.h b/utils/rbutilqt/mspack/system-mspack.h similarity index 100% rename from rbutil/rbutilqt/mspack/system-mspack.h rename to utils/rbutilqt/mspack/system-mspack.h diff --git a/rbutil/rbutilqt/mspack/szdd.h b/utils/rbutilqt/mspack/szdd.h similarity index 100% rename from rbutil/rbutilqt/mspack/szdd.h rename to utils/rbutilqt/mspack/szdd.h diff --git a/rbutil/rbutilqt/mspack/szddc.c b/utils/rbutilqt/mspack/szddc.c similarity index 100% rename from rbutil/rbutilqt/mspack/szddc.c rename to utils/rbutilqt/mspack/szddc.c diff --git a/rbutil/rbutilqt/mspack/szddd.c b/utils/rbutilqt/mspack/szddd.c similarity index 100% rename from rbutil/rbutilqt/mspack/szddd.c rename to utils/rbutilqt/mspack/szddd.c diff --git a/rbutil/rbutilqt/msvc/Makefile b/utils/rbutilqt/msvc/Makefile similarity index 100% rename from rbutil/rbutilqt/msvc/Makefile rename to utils/rbutilqt/msvc/Makefile diff --git a/rbutil/rbutilqt/msvc/README b/utils/rbutilqt/msvc/README similarity index 100% rename from rbutil/rbutilqt/msvc/README rename to utils/rbutilqt/msvc/README diff --git a/rbutil/rbutilqt/msvc/inttypes.h b/utils/rbutilqt/msvc/inttypes.h similarity index 100% rename from rbutil/rbutilqt/msvc/inttypes.h rename to utils/rbutilqt/msvc/inttypes.h diff --git a/rbutil/rbutilqt/msvc/stdbool.h b/utils/rbutilqt/msvc/stdbool.h similarity index 100% rename from rbutil/rbutilqt/msvc/stdbool.h rename to utils/rbutilqt/msvc/stdbool.h diff --git a/rbutil/rbutilqt/msvc/stdint.h b/utils/rbutilqt/msvc/stdint.h similarity index 100% rename from rbutil/rbutilqt/msvc/stdint.h rename to utils/rbutilqt/msvc/stdint.h diff --git a/rbutil/rbutilqt/preview.cpp b/utils/rbutilqt/preview.cpp similarity index 100% rename from rbutil/rbutilqt/preview.cpp rename to utils/rbutilqt/preview.cpp diff --git a/rbutil/rbutilqt/preview.h b/utils/rbutilqt/preview.h similarity index 100% rename from rbutil/rbutilqt/preview.h rename to utils/rbutilqt/preview.h diff --git a/rbutil/rbutilqt/previewfrm.ui b/utils/rbutilqt/previewfrm.ui similarity index 100% rename from rbutil/rbutilqt/previewfrm.ui rename to utils/rbutilqt/previewfrm.ui diff --git a/rbutil/rbutilqt/progressloggerfrm.ui b/utils/rbutilqt/progressloggerfrm.ui similarity index 100% rename from rbutil/rbutilqt/progressloggerfrm.ui rename to utils/rbutilqt/progressloggerfrm.ui diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/utils/rbutilqt/progressloggergui.cpp similarity index 100% rename from rbutil/rbutilqt/progressloggergui.cpp rename to utils/rbutilqt/progressloggergui.cpp diff --git a/rbutil/rbutilqt/progressloggergui.h b/utils/rbutilqt/progressloggergui.h similarity index 100% rename from rbutil/rbutilqt/progressloggergui.h rename to utils/rbutilqt/progressloggergui.h diff --git a/rbutil/rbutilqt/quazip/LICENSE.LGPL b/utils/rbutilqt/quazip/LICENSE.LGPL similarity index 100% rename from rbutil/rbutilqt/quazip/LICENSE.LGPL rename to utils/rbutilqt/quazip/LICENSE.LGPL diff --git a/rbutil/rbutilqt/quazip/README.ROCKBOX b/utils/rbutilqt/quazip/README.ROCKBOX similarity index 100% rename from rbutil/rbutilqt/quazip/README.ROCKBOX rename to utils/rbutilqt/quazip/README.ROCKBOX diff --git a/rbutil/rbutilqt/quazip/ioapi.h b/utils/rbutilqt/quazip/ioapi.h similarity index 100% rename from rbutil/rbutilqt/quazip/ioapi.h rename to utils/rbutilqt/quazip/ioapi.h diff --git a/rbutil/rbutilqt/quazip/minizip_crypt.h b/utils/rbutilqt/quazip/minizip_crypt.h similarity index 100% rename from rbutil/rbutilqt/quazip/minizip_crypt.h rename to utils/rbutilqt/quazip/minizip_crypt.h diff --git a/rbutil/rbutilqt/quazip/qioapi.cpp b/utils/rbutilqt/quazip/qioapi.cpp similarity index 100% rename from rbutil/rbutilqt/quazip/qioapi.cpp rename to utils/rbutilqt/quazip/qioapi.cpp diff --git a/rbutil/rbutilqt/quazip/quazip.cpp b/utils/rbutilqt/quazip/quazip.cpp similarity index 100% rename from rbutil/rbutilqt/quazip/quazip.cpp rename to utils/rbutilqt/quazip/quazip.cpp diff --git a/rbutil/rbutilqt/quazip/quazip.h b/utils/rbutilqt/quazip/quazip.h similarity index 100% rename from rbutil/rbutilqt/quazip/quazip.h rename to utils/rbutilqt/quazip/quazip.h diff --git a/rbutil/rbutilqt/quazip/quazip.pri b/utils/rbutilqt/quazip/quazip.pri similarity index 100% rename from rbutil/rbutilqt/quazip/quazip.pri rename to utils/rbutilqt/quazip/quazip.pri diff --git a/rbutil/rbutilqt/quazip/quazip_global.h b/utils/rbutilqt/quazip/quazip_global.h similarity index 100% rename from rbutil/rbutilqt/quazip/quazip_global.h rename to utils/rbutilqt/quazip/quazip_global.h diff --git a/rbutil/rbutilqt/quazip/quazipfile.cpp b/utils/rbutilqt/quazip/quazipfile.cpp similarity index 100% rename from rbutil/rbutilqt/quazip/quazipfile.cpp rename to utils/rbutilqt/quazip/quazipfile.cpp diff --git a/rbutil/rbutilqt/quazip/quazipfile.h b/utils/rbutilqt/quazip/quazipfile.h similarity index 100% rename from rbutil/rbutilqt/quazip/quazipfile.h rename to utils/rbutilqt/quazip/quazipfile.h diff --git a/rbutil/rbutilqt/quazip/quazipfileinfo.cpp b/utils/rbutilqt/quazip/quazipfileinfo.cpp similarity index 100% rename from rbutil/rbutilqt/quazip/quazipfileinfo.cpp rename to utils/rbutilqt/quazip/quazipfileinfo.cpp diff --git a/rbutil/rbutilqt/quazip/quazipfileinfo.h b/utils/rbutilqt/quazip/quazipfileinfo.h similarity index 100% rename from rbutil/rbutilqt/quazip/quazipfileinfo.h rename to utils/rbutilqt/quazip/quazipfileinfo.h diff --git a/rbutil/rbutilqt/quazip/quazipnewinfo.cpp b/utils/rbutilqt/quazip/quazipnewinfo.cpp similarity index 100% rename from rbutil/rbutilqt/quazip/quazipnewinfo.cpp rename to utils/rbutilqt/quazip/quazipnewinfo.cpp diff --git a/rbutil/rbutilqt/quazip/quazipnewinfo.h b/utils/rbutilqt/quazip/quazipnewinfo.h similarity index 100% rename from rbutil/rbutilqt/quazip/quazipnewinfo.h rename to utils/rbutilqt/quazip/quazipnewinfo.h diff --git a/rbutil/rbutilqt/quazip/unzip.c b/utils/rbutilqt/quazip/unzip.c similarity index 100% rename from rbutil/rbutilqt/quazip/unzip.c rename to utils/rbutilqt/quazip/unzip.c diff --git a/rbutil/rbutilqt/quazip/unzip.h b/utils/rbutilqt/quazip/unzip.h similarity index 100% rename from rbutil/rbutilqt/quazip/unzip.h rename to utils/rbutilqt/quazip/unzip.h diff --git a/rbutil/rbutilqt/quazip/zip.c b/utils/rbutilqt/quazip/zip.c similarity index 100% rename from rbutil/rbutilqt/quazip/zip.c rename to utils/rbutilqt/quazip/zip.c diff --git a/rbutil/rbutilqt/quazip/zip.h b/utils/rbutilqt/quazip/zip.h similarity index 100% rename from rbutil/rbutilqt/quazip/zip.h rename to utils/rbutilqt/quazip/zip.h diff --git a/rbutil/rbutilqt/rbutil.ini b/utils/rbutilqt/rbutil.ini similarity index 100% rename from rbutil/rbutilqt/rbutil.ini rename to utils/rbutilqt/rbutil.ini diff --git a/rbutil/rbutilqt/rbutilqt-lang.qrc b/utils/rbutilqt/rbutilqt-lang.qrc similarity index 100% rename from rbutil/rbutilqt/rbutilqt-lang.qrc rename to utils/rbutilqt/rbutilqt-lang.qrc diff --git a/rbutil/rbutilqt/rbutilqt-win.qrc b/utils/rbutilqt/rbutilqt-win.qrc similarity index 100% rename from rbutil/rbutilqt/rbutilqt-win.qrc rename to utils/rbutilqt/rbutilqt-win.qrc diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp similarity index 100% rename from rbutil/rbutilqt/rbutilqt.cpp rename to utils/rbutilqt/rbutilqt.cpp diff --git a/rbutil/rbutilqt/rbutilqt.h b/utils/rbutilqt/rbutilqt.h similarity index 100% rename from rbutil/rbutilqt/rbutilqt.h rename to utils/rbutilqt/rbutilqt.h diff --git a/rbutil/rbutilqt/rbutilqt.manifest b/utils/rbutilqt/rbutilqt.manifest similarity index 100% rename from rbutil/rbutilqt/rbutilqt.manifest rename to utils/rbutilqt/rbutilqt.manifest diff --git a/rbutil/rbutilqt/rbutilqt.pri b/utils/rbutilqt/rbutilqt.pri similarity index 100% rename from rbutil/rbutilqt/rbutilqt.pri rename to utils/rbutilqt/rbutilqt.pri diff --git a/rbutil/rbutilqt/rbutilqt.pro b/utils/rbutilqt/rbutilqt.pro similarity index 97% rename from rbutil/rbutilqt/rbutilqt.pro rename to utils/rbutilqt/rbutilqt.pro index 044ff95237..f172e231bf 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/utils/rbutilqt/rbutilqt.pro @@ -61,7 +61,7 @@ contains(QT_MAJOR_VERSION, 4) { } RBBASE_DIR = $$_PRO_FILE_PWD_ -RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,) +RBBASE_DIR = $$replace(RBBASE_DIR,/utils/rbutilqt,) message("using Rockbox basedir $$RBBASE_DIR") @@ -80,7 +80,7 @@ message("using Rockbox basedir $$RBBASE_DIR") } extralibs.commands = $$SILENT \ - $(MAKE) -f $$RBBASE_DIR/rbutil/rbutilqt/Makefile.libs \ + $(MAKE) -f $$RBBASE_DIR/utils/rbutilqt/Makefile.libs \ $$VERBOSE \ SYS_SPEEX=\"$$LIBSPEEX\" \ BUILD_DIR=$$MYLIBBUILDDIR/ \ @@ -133,7 +133,7 @@ exists($$LRELEASE) { INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \ $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base \ $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/gui -INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher \ +INCLUDEPATH += $$RBBASE_DIR/utils/ipodpatcher $$RBBASE_DIR/utils/sansapatcher \ $$RBBASE_DIR/tools/rbspeex $$RBBASE_DIR/tools INCLUDEPATH += logger diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/utils/rbutilqt/rbutilqt.qrc similarity index 100% rename from rbutil/rbutilqt/rbutilqt.qrc rename to utils/rbutilqt/rbutilqt.qrc diff --git a/rbutil/rbutilqt/rbutilqt.rc b/utils/rbutilqt/rbutilqt.rc similarity index 100% rename from rbutil/rbutilqt/rbutilqt.rc rename to utils/rbutilqt/rbutilqt.rc diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/utils/rbutilqt/rbutilqtfrm.ui similarity index 100% rename from rbutil/rbutilqt/rbutilqtfrm.ui rename to utils/rbutilqt/rbutilqtfrm.ui diff --git a/rbutil/rbutilqt/sysinfo.cpp b/utils/rbutilqt/sysinfo.cpp similarity index 100% rename from rbutil/rbutilqt/sysinfo.cpp rename to utils/rbutilqt/sysinfo.cpp diff --git a/rbutil/rbutilqt/sysinfo.h b/utils/rbutilqt/sysinfo.h similarity index 100% rename from rbutil/rbutilqt/sysinfo.h rename to utils/rbutilqt/sysinfo.h diff --git a/rbutil/rbutilqt/sysinfofrm.ui b/utils/rbutilqt/sysinfofrm.ui similarity index 100% rename from rbutil/rbutilqt/sysinfofrm.ui rename to utils/rbutilqt/sysinfofrm.ui diff --git a/rbutil/rbutilqt/systrace.cpp b/utils/rbutilqt/systrace.cpp similarity index 100% rename from rbutil/rbutilqt/systrace.cpp rename to utils/rbutilqt/systrace.cpp diff --git a/rbutil/rbutilqt/systrace.h b/utils/rbutilqt/systrace.h similarity index 100% rename from rbutil/rbutilqt/systrace.h rename to utils/rbutilqt/systrace.h diff --git a/rbutil/rbutilqt/systracefrm.ui b/utils/rbutilqt/systracefrm.ui similarity index 100% rename from rbutil/rbutilqt/systracefrm.ui rename to utils/rbutilqt/systracefrm.ui diff --git a/rbutil/rbutilqt/test/stubs/Logger.h b/utils/rbutilqt/test/stubs/Logger.h similarity index 100% rename from rbutil/rbutilqt/test/stubs/Logger.h rename to utils/rbutilqt/test/stubs/Logger.h diff --git a/rbutil/rbutilqt/test/stubs/stubs-compareversion.cpp b/utils/rbutilqt/test/stubs/stubs-compareversion.cpp similarity index 100% rename from rbutil/rbutilqt/test/stubs/stubs-compareversion.cpp rename to utils/rbutilqt/test/stubs/stubs-compareversion.cpp diff --git a/rbutil/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp b/utils/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp similarity index 100% rename from rbutil/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp rename to utils/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp diff --git a/rbutil/rbutilqt/test/test-compareversion.cpp b/utils/rbutilqt/test/test-compareversion.cpp similarity index 100% rename from rbutil/rbutilqt/test/test-compareversion.cpp rename to utils/rbutilqt/test/test-compareversion.cpp diff --git a/rbutil/rbutilqt/test/test-compareversion.pro b/utils/rbutilqt/test/test-compareversion.pro similarity index 100% rename from rbutil/rbutilqt/test/test-compareversion.pro rename to utils/rbutilqt/test/test-compareversion.pro diff --git a/rbutil/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp similarity index 100% rename from rbutil/rbutilqt/test/test-httpget.cpp rename to utils/rbutilqt/test/test-httpget.cpp diff --git a/rbutil/rbutilqt/test/test-httpget.pro b/utils/rbutilqt/test/test-httpget.pro similarity index 100% rename from rbutil/rbutilqt/test/test-httpget.pro rename to utils/rbutilqt/test/test-httpget.pro diff --git a/rbutil/rbutilqt/test/test-playerbuildinfo.cpp b/utils/rbutilqt/test/test-playerbuildinfo.cpp similarity index 100% rename from rbutil/rbutilqt/test/test-playerbuildinfo.cpp rename to utils/rbutilqt/test/test-playerbuildinfo.cpp diff --git a/rbutil/rbutilqt/test/test-playerbuildinfo.pro b/utils/rbutilqt/test/test-playerbuildinfo.pro similarity index 100% rename from rbutil/rbutilqt/test/test-playerbuildinfo.pro rename to utils/rbutilqt/test/test-playerbuildinfo.pro diff --git a/rbutil/rbutilqt/test/test-rockboxinfo.cpp b/utils/rbutilqt/test/test-rockboxinfo.cpp similarity index 100% rename from rbutil/rbutilqt/test/test-rockboxinfo.cpp rename to utils/rbutilqt/test/test-rockboxinfo.cpp diff --git a/rbutil/rbutilqt/test/test-rockboxinfo.pro b/utils/rbutilqt/test/test-rockboxinfo.pro similarity index 100% rename from rbutil/rbutilqt/test/test-rockboxinfo.pro rename to utils/rbutilqt/test/test-rockboxinfo.pro diff --git a/rbutil/rbutilqt/test/tests.pri b/utils/rbutilqt/test/tests.pri similarity index 100% rename from rbutil/rbutilqt/test/tests.pri rename to utils/rbutilqt/test/tests.pri diff --git a/rbutil/rbutilqt/themesinstallfrm.ui b/utils/rbutilqt/themesinstallfrm.ui similarity index 100% rename from rbutil/rbutilqt/themesinstallfrm.ui rename to utils/rbutilqt/themesinstallfrm.ui diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp similarity index 100% rename from rbutil/rbutilqt/themesinstallwindow.cpp rename to utils/rbutilqt/themesinstallwindow.cpp diff --git a/rbutil/rbutilqt/themesinstallwindow.h b/utils/rbutilqt/themesinstallwindow.h similarity index 100% rename from rbutil/rbutilqt/themesinstallwindow.h rename to utils/rbutilqt/themesinstallwindow.h diff --git a/rbutil/rbutilqt/uninstallfrm.ui b/utils/rbutilqt/uninstallfrm.ui similarity index 100% rename from rbutil/rbutilqt/uninstallfrm.ui rename to utils/rbutilqt/uninstallfrm.ui diff --git a/rbutil/rbutilqt/uninstallwindow.cpp b/utils/rbutilqt/uninstallwindow.cpp similarity index 100% rename from rbutil/rbutilqt/uninstallwindow.cpp rename to utils/rbutilqt/uninstallwindow.cpp diff --git a/rbutil/rbutilqt/uninstallwindow.h b/utils/rbutilqt/uninstallwindow.h similarity index 100% rename from rbutil/rbutilqt/uninstallwindow.h rename to utils/rbutilqt/uninstallwindow.h diff --git a/rbutil/rbutilqt/version.h b/utils/rbutilqt/version.h similarity index 100% rename from rbutil/rbutilqt/version.h rename to utils/rbutilqt/version.h diff --git a/rbutil/rbutilqt/zlib/zconf.h b/utils/rbutilqt/zlib/zconf.h similarity index 100% rename from rbutil/rbutilqt/zlib/zconf.h rename to utils/rbutilqt/zlib/zconf.h diff --git a/rbutil/rbutilqt/zlib/zlib.h b/utils/rbutilqt/zlib/zlib.h similarity index 100% rename from rbutil/rbutilqt/zlib/zlib.h rename to utils/rbutilqt/zlib/zlib.h diff --git a/rbutil/sansapatcher/Makefile b/utils/sansapatcher/Makefile similarity index 100% rename from rbutil/sansapatcher/Makefile rename to utils/sansapatcher/Makefile diff --git a/rbutil/sansapatcher/README b/utils/sansapatcher/README similarity index 100% rename from rbutil/sansapatcher/README rename to utils/sansapatcher/README diff --git a/rbutil/sansapatcher/main.c b/utils/sansapatcher/main.c similarity index 100% rename from rbutil/sansapatcher/main.c rename to utils/sansapatcher/main.c diff --git a/rbutil/sansapatcher/parttypes.h b/utils/sansapatcher/parttypes.h similarity index 100% rename from rbutil/sansapatcher/parttypes.h rename to utils/sansapatcher/parttypes.h diff --git a/rbutil/sansapatcher/sansaio-posix.c b/utils/sansapatcher/sansaio-posix.c similarity index 100% rename from rbutil/sansapatcher/sansaio-posix.c rename to utils/sansapatcher/sansaio-posix.c diff --git a/rbutil/sansapatcher/sansaio-win32.c b/utils/sansapatcher/sansaio-win32.c similarity index 100% rename from rbutil/sansapatcher/sansaio-win32.c rename to utils/sansapatcher/sansaio-win32.c diff --git a/rbutil/sansapatcher/sansaio.h b/utils/sansapatcher/sansaio.h similarity index 100% rename from rbutil/sansapatcher/sansaio.h rename to utils/sansapatcher/sansaio.h diff --git a/rbutil/sansapatcher/sansapatcher.c b/utils/sansapatcher/sansapatcher.c similarity index 100% rename from rbutil/sansapatcher/sansapatcher.c rename to utils/sansapatcher/sansapatcher.c diff --git a/rbutil/sansapatcher/sansapatcher.h b/utils/sansapatcher/sansapatcher.h similarity index 100% rename from rbutil/sansapatcher/sansapatcher.h rename to utils/sansapatcher/sansapatcher.h diff --git a/rbutil/sansapatcher/sansapatcher.manifest b/utils/sansapatcher/sansapatcher.manifest similarity index 100% rename from rbutil/sansapatcher/sansapatcher.manifest rename to utils/sansapatcher/sansapatcher.manifest diff --git a/rbutil/sansapatcher/sansapatcher.pro b/utils/sansapatcher/sansapatcher.pro similarity index 100% rename from rbutil/sansapatcher/sansapatcher.pro rename to utils/sansapatcher/sansapatcher.pro diff --git a/rbutil/sansapatcher/sansapatcher.rc b/utils/sansapatcher/sansapatcher.rc similarity index 100% rename from rbutil/sansapatcher/sansapatcher.rc rename to utils/sansapatcher/sansapatcher.rc diff --git a/rbutil/tools/Makefile b/utils/tools/Makefile similarity index 100% rename from rbutil/tools/Makefile rename to utils/tools/Makefile diff --git a/rbutil/tools/bin2c.c b/utils/tools/bin2c.c similarity index 100% rename from rbutil/tools/bin2c.c rename to utils/tools/bin2c.c