Rearrange install a bit