Separated out directives into different files