Reorganise the directives in the router, controllers called directly from the templates.