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

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