Refactored main class name to "Client"...