rearrange repo structure