Moved most methods that had been moved from User to modules to their own separate classes. This way instead of including several modules in the User model, the User model calls methods in these new classes.

I prefer this organization, separating functionality in discrete classes, to the way it was done before (dumping related methods in modules).