diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index e71faad707f1..1c8f15628aba 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -39,9 +39,9 @@ from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import utils
-from nova.virt.disk import guestfs
-from nova.virt.disk import loop
-from nova.virt.disk import nbd
+from nova.virt.disk.mount import guestfs
+from nova.virt.disk.mount import loop
+from nova.virt.disk.mount import nbd
 from nova.virt import images
 
 
@@ -229,7 +229,7 @@ class _DiskImage(object):
     @staticmethod
     def _handler_class(mode=None, device=None):
         """Look up the appropriate class to use based on MODE or DEVICE."""
-        for cls in (loop.Mount, nbd.Mount, guestfs.Mount):
+        for cls in (loop.LoopMount, nbd.NbdMount, guestfs.GuestFSMount):
             if mode and cls.mode == mode:
                 return cls
             elif device and cls.device_id_string in device:
diff --git a/nova/virt/disk/mount/__init__.py b/nova/virt/disk/mount/__init__.py
new file mode 100644
index 000000000000..5c18da32dec6
--- /dev/null
+++ b/nova/virt/disk/mount/__init__.py
@@ -0,0 +1,19 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+"""
+Support for mounting disk images on the host filesystem
+
+"""
diff --git a/nova/virt/disk/mount.py b/nova/virt/disk/mount/api.py
similarity index 100%
rename from nova/virt/disk/mount.py
rename to nova/virt/disk/mount/api.py
diff --git a/nova/virt/disk/guestfs.py b/nova/virt/disk/mount/guestfs.py
similarity index 98%
rename from nova/virt/disk/guestfs.py
rename to nova/virt/disk/mount/guestfs.py
index 21e33b1d799e..2e29b9b431f6 100644
--- a/nova/virt/disk/guestfs.py
+++ b/nova/virt/disk/mount/guestfs.py
@@ -19,10 +19,10 @@ import os
 
 from nova import exception
 from nova import utils
-from nova.virt.disk import mount
+from nova.virt.disk.mount import api
 
 
-class Mount(mount.Mount):
+class GuestFSMount(api.Mount):
     """libguestfs support for arbitrary images."""
     mode = 'guestfs'
     device_id_string = 'guest'
diff --git a/nova/virt/disk/loop.py b/nova/virt/disk/mount/loop.py
similarity index 95%
rename from nova/virt/disk/loop.py
rename to nova/virt/disk/mount/loop.py
index 3dfdc32d3f4f..9b87b6df511d 100644
--- a/nova/virt/disk/loop.py
+++ b/nova/virt/disk/mount/loop.py
@@ -16,10 +16,10 @@
 """Support for mounting images with the loop device"""
 
 from nova import utils
-from nova.virt.disk import mount
+from nova.virt.disk.mount import api
 
 
-class Mount(mount.Mount):
+class LoopMount(api.Mount):
     """loop back support for raw images."""
     mode = 'loop'
     device_id_string = mode
diff --git a/nova/virt/disk/nbd.py b/nova/virt/disk/mount/nbd.py
similarity index 98%
rename from nova/virt/disk/nbd.py
rename to nova/virt/disk/mount/nbd.py
index 8503273a6c17..b374ccacc387 100644
--- a/nova/virt/disk/nbd.py
+++ b/nova/virt/disk/mount/nbd.py
@@ -22,7 +22,7 @@ from nova import config
 from nova import flags
 from nova.openstack.common import cfg
 from nova import utils
-from nova.virt.disk import mount
+from nova.virt.disk.mount import api
 
 
 nbd_opts = [
@@ -38,7 +38,7 @@ CONF = config.CONF
 CONF.register_opts(nbd_opts)
 
 
-class Mount(mount.Mount):
+class NbdMount(api.Mount):
     """qemu-nbd support disk images."""
     mode = 'nbd'
     device_id_string = mode