Updated to new directory structure (no extra-bin), and with all the right
binaries in bin.