Support multiple repos, improve path grouping