Rearrange repo structure