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

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