rearrange filestruct