move structs to util