Moved DXML to external library
v2.2
Ran FindBugs, and fixed things.
Formatted Code