Restructure router, get rid of presenter.