Namespace everything under bb_
Reorganize