Add BTBB as build requirement
Commit missing files from previous commit