Moved a couple of Atom mapping classes

Moved from the server into the common Atom module.