move definition and use classes to model package