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

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