OEC-42 Add instructors export, refactor to share some code