Post Sprint

Refactoring of desktop classes and PHP methods.