Moved directives into separate files for modularity