Refactor xhtml 1.1 module categorisation