Can you move this struct to util.go?