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

This reverts commit b07c3b62d757eaaccd61e40870361451e2bc0820.
Rebase from 'upstream'
Trimmed the branch to only the bwi_tools sub directory