Reorganizing imports