Convert server classes to client classes
Merge pull request #1 from JTGround/dev

Convert server classes to client classes