Reorganizing the import statements