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

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