Rearrange directories
Add XMLParser support