Revised xml creation strategy

Separate files for each xml created