move to package of model
move to package of initial
create better solution
move to package of initial