Refactor - Split up payement listeners
Missing files from previous commit
Commit my messages.properties