refactoring, added atom.xml generation