Refactor router and controller creation