Changes to the Payment Creation

Tabbed the categories of payments to avoid confusion
Revert "Changes to the Payment Creation"

This reverts commit 0ee3c05a85cc7c31bab63e4bab7568a35a1c8b1b.
[Changes to the Payment Creation]

Actual commit for the previously reverted commit
Merge pull request #25 from lgbmontenegroii/master

Changes to the Payment Creation
fix merge conflicts