Extracted Client interface
Merge pull request #13 from andlaz/master

Extracted Client interface; some renaming