Ported [Files] breakup to [Tasks] version