Refactoring master to better represent course material