move to package of initial
better solutions
move to package of model