modularizing the client
Merge pull request #1 from cmlorenz/master

modularizing the client