Further seperated CatalogBundle from WebBundle