Extracted Server Calls to new classes
Merge branch 'master' of https://github.com/elanas/Shuq