Changing templates path
Resolved directives bug