Move filesystem walking logic into the collector
Update tests to match
Track duplicates as they're created
Allow for merging of buckets.