Fixed Client

Listener is now an embedded class in Client.