Task folder re-organized