Remove nested 'cell' class, convert to an multi-array based datastructure