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

This reverts commit 363a49e3c9d0ead77266bc14a4b1a1b3adb5d5b7.
Rebase from 'upstream'
Trimmed the branch to only the bwi_mapper sub directory