Default router
Modularize mediator
Fix typo with mediator file