Remove Router Remove RouterInterface Rename RouteMapInterface to RouterInterface Rename RouteMap to Router Rename add() to register() Make register fluid