+ Adding UserName()

Also moved "User" specific code to the newly created user.go