Reorganise the directives, controllers and templates.

+ Reorganise the directives in the router
+ controllers called directly from the templates rather than from the router (allows using same template with 2 different sets of data / 2 controllers)
+ rename certain files