Modified and delete unnessary files
move to models packages
move to utility packages
import resolves
import resolves