payment folder reorg
Merge branch 'master' of https://github.com/givechange/web