Refactored directives into separate files.