Change role and user models to module