moved some more classes to model package