Move user directives into the user module