Minor reorganization/refactor
Minor reorganization/refactor

no new functionality, just merged similar behaviours.

freerunningtech/solidus_paypal_express,StemboltHQ/solidus_paypal_express,freerunningtech/solidus_paypal_express,StemboltHQ/solidus_paypal_express,StemboltHQ/solidus_paypal_express,freerunningtech/solidus_paypal_express