Making the POD classes into structs