reorganizing the folders structure