restructure CoreData Group