Rename things to thing

WIP
TODO: fix menu structure.