Rename to match XML document
Modify class names ; put in correct package