Rearrange folder structure