Add tests for some additional components.
Use modular approach to organize routers.