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

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