Restructured XML classes