Removing PaymentPlan completly
Renaming util classes