Move package utility to utility package