Updated to new bundle structure

- [x] finish the code
- [x] gather feedback for my changes


| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| Tests pass?   | none
| Fixed tickets | #13 
| Doc           | none