Refactored ClientDriver into multiple smaller classes
Minor corrections