Reshuffle direct payment apis (jaxrs) and fix glitches