Trying to simplify modules
Refactoring payment concerns