add bbb referance and restructure puppet things