Sort new imports properly