- move XML files to a subdirectory
- simplified code a bit