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

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