Refacotrs users into two directives.