Refactored matches directives into a new module; Changed the names of custom directives