Light refactoring of converter
Add Atom converter, and interface for choosing conversion formats
Correct Atom IDs