Reorganised imports