Reestructuring User Module

Need to reestrocture the User Module