Merged core and util sub-packages (into 'util')