renaming util to struct
adapt to change of util to struct