Refactor users and courses import