Moved around file name.
Authentication.Authentication is now
Authentication.UserInfo
Minor annotations.
Merge origin/master