Put all binaries in the same place
Update submodules to use aharrison24 mods