Tasks folder restructure