Merge pull request #23 from hayksaakian/master

move client code to api