Modularization of XHTML related domains (2)