Changed the structure of User Class and all other classes connected to it.
Changed the structure of User Class and all other classes connected to it.