Trim and split the util lib to make more sense.