Also update for changes to how models are created, various other changes.

- add two classes conforming to BUYPaymentSessionProvider for internal use
- modify the API to only return payment tokens wrapped by protocol
- merge two `completePayment` methods into a single method

Also update to support new JSON serialization and dirty tracking.

Standardize category names and unify to have one category per class. Move files to "Additions" directory.