Reorganize buildpacks, because order matters