Cleanup, move directives to a folder.