Move directives to separate files