Moved Identity related stuff into the identity.go file.