Merge "Moving classes inside of CellLayout to their own file" into main