Merge "Move classes inside of CellLayoutBoard to their own file" into main