fix router and controller classes