Keenan - Refactored directives into their own files