Moved RouterFactory to RouterListenerFactory