Rearrange repos according to group

this make it more systematical and clear to look for