remove old code
rename models/collections