rearrange some directories layout