Refactor users into their own module