reorganizes imports a little bit