Refactor sub-tasks into proper thor tasks and compose complex tasks from them