Rearrangement of the folder structure