Revamped Payment structures

Overhauled the payment mechanism in order to make it more flexible. This
opens doors to new options like deleting activities.