Payment and Client directive refactoring
Payment and Client submit() refactoring