Paypal pro refactoring

See notes in UPGRADE.md