Updates data model in key module.
Finishes updating key module for new api.
Updates payment module for new api.
Updates amazon_payment for new api.