Corrected file renaming
Added proportion to compute/merge
Added main tests.