[+] change structure to be compliant with standard bundle