more console commands and structs to classes conversion