Restructuring imports