Refactored models into a more intuitive arrangement. See my email, then take a look at the new structure.