Organise and re-arrange imports