First commit for gp2xml + clean up