Fix grouping of sources in lockfile - closes #85