Moved directives into seperate files