refactor block declaration in each bundles config.yml