Polishing the task infrastructure
Removed unnecessary files and classes
General refactoring of the task subsystem
Merge branch 'exp' into develop