Moving Model.Context to Model

combining model.context and model into one assembly