Client refactoring, listeners moved to separate java files