CoreData Refractor

Initial CoreData refractor