Reorganized the code
Tentative to add the client library to pypi