Reorganized imports
Updated XHTML DTDs to version 4