More package name change
Move old coco functions to util directory