More restructuring for XML Catalog's DTDs