refactor block declaration in each bundles