Add client service structure, modified makefile