improved layout of binaries and updated script accordingly