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

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