Replaced directives with ng-includes