Changed user to be User entity everywhere.

Eventually I will remove Jeeves user as well but for now this is good.