refactored payment, clientStatus and related classes.