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

This reverts commit d0d0356262ff9b9c28bd2649495f13e728a54558.
Rebase from 'upstream'
Trimmed the branch to only the lockfree sub directory