final version, change in core data models
Removed Coredata models