Change folder structure and add index task