diff --git a/pisi/dependency.py b/pisi/dependency.py
index 28ea779d..45b853bd 100644
--- a/pisi/dependency.py
+++ b/pisi/dependency.py
@@ -21,7 +21,7 @@ _ = __trans.ugettext
 import pisi.context as ctx
 import pisi.packagedb as packagedb
 from pisi.version import Version
-import pisi.autoxml as autoxml
+import pisi.xml.autoxml as autoxml
 from pisi.util import Checks
 
 class Dependency:
diff --git a/pisi/files.py b/pisi/files.py
index 2dd7d837..dedfc0d9 100644
--- a/pisi/files.py
+++ b/pisi/files.py
@@ -15,7 +15,7 @@
 
 # Authors:  Eray Ozkural <eray@uludag.org.tr>
 
-import pisi.autoxml as autoxml
+import pisi.xml.autoxml as autoxml
 from pisi.util import Checks
 import pisi.lockeddbshelve as shelve
 
diff --git a/pisi/index.py b/pisi/index.py
index e7d0dcb6..105c992c 100644
--- a/pisi/index.py
+++ b/pisi/index.py
@@ -28,8 +28,8 @@ import pisi.metadata as metadata
 import pisi.packagedb as packagedb
 import pisi.util as util
 from pisi.package import Package
-from pisi.xmlfile import XmlFile
-import pisi.autoxml as autoxml
+from pisi.xml.xmlfile import XmlFile
+import pisi.xml.autoxml as autoxml
 from pisi.uri import URI
 
 class Error(pisi.Error):
diff --git a/pisi/specfile.py b/pisi/specfile.py
index 9a796981..27388ae9 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -26,8 +26,8 @@ _ = __trans.ugettext
 from os.path import basename
 
 # pisi modules
-from pisi.xmlfile import XmlFile
-import pisi.autoxml as autoxml
+from pisi.xml.xmlfile import XmlFile
+import pisi.xml.autoxml as autoxml
 import pisi.context as ctx
 from pisi.dependency import Dependency
 import pisi.dependency