Move xml class to own file
Move xml class to own file