Client include

Switched from  class declaration to class include for the client.

It makes manifests little bit more flexible, I need the change to install both: server and client on the same node

So more change which have not been merged  yet are also there, please review commit messages