diff --git a/py/__init__.py b/py/__init__.py
index 4a1cd9e2f..e70f1fbe9 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -185,12 +185,12 @@ initpkg(__name__,
     'error'                  : ('./error.py', 'error'),
 
     # small and mean xml/html generation
-    'xml.__doc__'            : ('./xmlobj/__init__.py', '__doc__'),
-    'xml.html'               : ('./xmlobj/xmlgen.py', 'html'),
-    'xml.Tag'                : ('./xmlobj/xmlgen.py', 'Tag'),
-    'xml.raw'                : ('./xmlobj/xmlgen.py', 'raw'),
-    'xml.Namespace'          : ('./xmlobj/xmlgen.py', 'Namespace'),
-    'xml.escape'             : ('./xmlobj/xmlgen.py', 'escape'),
+    'xml.__doc__'            : ('./xmlgen.py', '__doc__'), 
+    'xml.html'               : ('./xmlgen.py', 'html'),
+    'xml.Tag'                : ('./xmlgen.py', 'Tag'),
+    'xml.raw'                : ('./xmlgen.py', 'raw'),
+    'xml.Namespace'          : ('./xmlgen.py', 'Namespace'),
+    'xml.escape'             : ('./xmlgen.py', 'escape'),
 
     # logging API ('producers' and 'consumers' connected via keywords)
     'log.__doc__'            : ('./log/__init__.py', '__doc__'),
diff --git a/py/xmlobj/testing/test_xml.py b/py/_testing/test_xmlgen.py
similarity index 98%
rename from py/xmlobj/testing/test_xml.py
rename to py/_testing/test_xmlgen.py
index b4acaf7b3..e92297562 100644
--- a/py/xmlobj/testing/test_xml.py
+++ b/py/_testing/test_xmlgen.py
@@ -1,6 +1,6 @@
 
 import py
-from py.__.xmlobj.xmlgen import unicode, html
+from py.__.xmlgen import unicode, html
 
 class ns(py.xml.Namespace): 
     pass 
diff --git a/py/xmlobj/xmlgen.py b/py/xmlgen.py
similarity index 100%
rename from py/xmlobj/xmlgen.py
rename to py/xmlgen.py
diff --git a/py/xmlobj/__init__.py b/py/xmlobj/__init__.py
deleted file mode 100644
index 7caf45491..000000000
--- a/py/xmlobj/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-""" small and mean xml/html generation """
-
diff --git a/py/xmlobj/testing/__init__.py b/py/xmlobj/testing/__init__.py
deleted file mode 100644
index 792d60054..000000000
--- a/py/xmlobj/testing/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#