[WIP] Add Bundle namespace

 - [ ] Client