Refactor Directives to a Module