[IMPROVEMENT] improve xml contents (issue #1)
[IMPROVEMENT] rename files to start with number (issue #2)