Switched from regex to xml parsing
Package rearrangement