Namespace model classes

Completes the second todo on #66.