Some refactoring; moved a lot of stuff from Supervisor\Manager to Supervisor\Client