Restructing XSD compilation

2 jobs for mark/update_testing in 19 seconds (queued for 4 seconds)