Renamed classes, new 'struct' type (more compact than arrays)