Refactor - moved some generic directives to the "common" module