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

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