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

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