Add model relational options
rename some files
remove some columns
fix conflict