Re-organize repos as well

And fix RepoComment.update