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

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