Client re-structured

The client class has been restructured to use methods, rather than one
large main method.
Merge branch 'master' of https://github.com/SEPRGroup/SEPR4Project