Split out chorus-util package