add models file
merge
refactor and add models