Rearrange doc structure