Reorganize RowAdder