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

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