revamping models, fixing confusion in folders
merge