Added cpr / psa constructs (prepayment vectors)
Some code rearrangement