2D array changed to struct