restructured collections, refactored client code to call course model instead of querymapper