MDL-35433 SCORM: move xml2data class into classes directory and small tidy