Moved XPaths into a substruct as more and more are coming