Reorganized the models into a more sane hierarchy.