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

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