move cell data structures state to Cells