Consolidate filter and route config
Consolidate bundle config