Rearranging imports