Removed obsolete datamodel files
Created classes for new data model