Reorganizing views, with mediator and router