rearrange directory structure