-Package rename
-Code cleanup (moved xml parsing code to a separate file)