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

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