Update tex file, replace structs with classes