big binaries reorganisation, hopefully last one in this project