moved model class