[cleanup] util/helper packages should only be for those classes