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

This reverts commit 30b6fba87f8be45a350a45a09a6993d82d3decc3.
Rebase from 'upstream'
Trimmed the branch to only the unique_id sub directory