improved client structure and makefile
more makefile changes