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

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