Adds Identity and discovery methods.

Moves all NAMESPACE's into Atom namespace where they belong.