Revert "XML structure reorganization"

This reverts commit a3abd3caa93b3abc6cdb2177d8d0c2217b796261.