The catalogue has a slot for specifying a directory structure for XQueryX files
XQueryXQueryOffsetPath="Queries/XQueryX/"

However (having built XQueryX and XSLT versions of all the XQuery test files)
I think it would help if a couple of extra attributes were added.

The filenames are specified as, eg, <query name="Literals003.xq"
with full name including the extension. It would be helpful (or at least more
symmetric) if the extension was omitted from the name attribute and instead a
top level attribute XQueryExtension=".xq" were added to the <test-suite element.

This would allow XQueryX files to be specified with a top level
 XQueryXQueryOffsetPath="Queries/XQueryX/"
and
 XQueryXExtension=".xqx"

Currently all the test files are authored in XQuery and automatically converted
to XQueryX, however that inevitably means that some aspects of XQueryX are not
tested: In order to gain full coverage of XQueryX (or any other syntax, such as
XSLT) it would be necessary to hand author some test files in that syntax, and
in that case convert those tests _to_ XQuery. In order to drive a convertor to
convert the tests in appropriate ways it would be useful to have a
"sourceformat" attribute on the <query (or <test-case) element that specified
which format was the source for the test. The schema could default this to
XQuery, so none of the current tests would be affected, but it would allow hand
written XQueryX tests to be dropped in to the test suite without having them
overwritten by a general XQuery-to-XQueryX convertor, and allow an automatic
XQueryX-to-XQuery convertor to generate XQuery test files for those tests.

David