Rename structs, add comments