Code refinements + Makefile error fix.

* Makefile pointed to the temporary src directory; fixed now.
* Syntax & code refinements.
* Cleanly splitted Client struct.