Remove redundant files
Update models
Update models
Fix merge conflicts