moving directives into modules