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

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