Rearrange directories
Add XMLParser support
Merge branch 'master' into gh-pages
Update link