refactor User module
refactor Users module