Revert "Trimmed the branch to only the resource_retriever sub directory"

This reverts commit b37fb50fed6d34aa347102c6ffb742b171d8d86f.
Rebase from 'upstream'
Trimmed the branch to only the resource_retriever sub directory