am 8c920dd3: Refactoring CellLayout into three classes

* commit '8c920dd3683d752aa4c43e964831ce53f9b72887':
  Refactoring CellLayout into three classes