Rearrange directory structure