Updated to use RoutingBundle

Updated to use renamed RoutingBundle

To be merged if travis is OK.