CoreDataStack renamed to CDKStack