Package migration, part 2: move util to core.