Reorganizing import