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

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