Finished breakup of [Files] on [Tasks] version

It was not complete in my last commit