Rearrange imports