Reorganize binaries