Moved the models to a separate assembly