Updated to use RoutingBundle

Use the  renamed RoutingExtraBundle -> RoutingBundle
will PR some more bundles in order not to break anything