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

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