Added CoreViewController and removed CoreDataViewController