Binaries reorganiezed