rearrange dir structures