Moved XML structs to nested as much as possible