Moved code around in the User class

The getters and setters are on the top of the User class now.