rename struct
wip