Moved controllers and directives to separate files