More client side refractoring.
Merge branch 'master' of https://github.com/gda08/MasterThesis.git