Refactor User Module to be Users Module