rename mr -> router
update comments