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

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