Got rid of the ObjectModel folder