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

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