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

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