[#9] Organising imports