Refactoring to move client code into subfolder.
Merge pull request #20 from andrewhao/master

Refactoring to move client code into subfolder.