Move tasks into own Task directories