one class per unit, step1
Model classes separation, step2.