Switched to global functions for controllers and directives. Means better ordered imports and less entanglements because of dependency on 'app' global variable.