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

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