Bundle structure changed to fit composer