Changed structs in from old c to c++ syntax. #142