moving models into own classes