Moved directives to seperate files