rename classes, put in common model