Revert "Change role and user models to module"

This reverts commit 7c2576aeabfec1caf2b46aef1d077e1ccf86f721.