refactor tasks into subfolder