Move bs2b.h to a more appropriate place