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

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