Rearranges folder structure