Fixed some arrays to struct
Fixed some variables to struct
Fixed some variables to struct