Added back in the model classes, but as a different assembly.