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

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