First pass at fixing JAXRS resources for Payment rework