Refactor folder retrieval logic to improve clarity and maintainability#46

matt-goldman merged 2 commits intomainmatt-goldman/blake:mainfrom

fix-duplicate-content-index-entriesmatt-goldman/blake:fix-duplicate-content-index-entriesCopy head branch name to clipboard