diff --git a/cinder/tests/fake_flags.py b/cinder/tests/fake_flags.py
index 0f4aba7f9e9..0266a5ff631 100644
--- a/cinder/tests/fake_flags.py
+++ b/cinder/tests/fake_flags.py
@@ -23,7 +23,7 @@ FLAGS = flags.FLAGS
 flags.DECLARE('iscsi_num_targets', 'cinder.volume.driver')
 flags.DECLARE('policy_file', 'cinder.policy')
 flags.DECLARE('volume_driver', 'cinder.volume.manager')
-flags.DECLARE('xiv_proxy', 'cinder.volume.xiv')
+flags.DECLARE('xiv_proxy', 'cinder.volume.drivers.xiv')
 
 def_vol_type = 'fake_vol_type'
 
diff --git a/cinder/tests/test_HpSanISCSIDriver.py b/cinder/tests/test_HpSanISCSIDriver.py
index ab15582cfc5..304222ed8ac 100644
--- a/cinder/tests/test_HpSanISCSIDriver.py
+++ b/cinder/tests/test_HpSanISCSIDriver.py
@@ -14,7 +14,7 @@
 from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder.volume.san.hp_lefthand import HpSanISCSIDriver
+from cinder.volume.drivers.san.hp_lefthand import HpSanISCSIDriver
 
 LOG = logging.getLogger(__name__)
 
diff --git a/cinder/tests/test_drivers_compatibility.py b/cinder/tests/test_drivers_compatibility.py
index 263433f9c8c..c762002d4b3 100644
--- a/cinder/tests/test_drivers_compatibility.py
+++ b/cinder/tests/test_drivers_compatibility.py
@@ -21,6 +21,19 @@ FLAGS = flags.FLAGS
 
 RBD_MODULE = "cinder.volume.drivers.rbd.RBDDriver"
 SHEEPDOG_MODULE = "cinder.volume.drivers.sheepdog.SheepdogDriver"
+NEXENTA_MODULE = "cinder.volume.drivers.nexenta.volume.NexentaDriver"
+SAN_MODULE = "cinder.volume.drivers.san.san.SanISCSIDriver"
+SOLARIS_MODULE = "cinder.volume.drivers.san.solaris.SolarisISCSIDriver"
+LEFTHAND_MODULE = "cinder.volume.drivers.san.hp_lefthand.HpSanISCSIDriver"
+NETAPP_MODULE = "cinder.volume.drivers.netapp.NetAppISCSIDriver"
+NETAPP_CMODE_MODULE = "cinder.volume.drivers.netapp.NetAppCmodeISCSIDriver"
+NETAPP_NFS_MODULE = "cinder.volume.drivers.netapp_nfs.NetAppNFSDriver"
+NFS_MODULE = "cinder.volume.drivers.nfs.NfsDriver"
+SOLIDFIRE_MODULE = "cinder.volume.drivers.solidfire.SolidFire"
+STORWIZE_SVC_MODULE = "cinder.volume.drivers.storwize_svc.StorwizeSVCDriver"
+WINDOWS_MODULE = "cinder.volume.drivers.windows.WindowsDriver"
+XIV_MODULE = "cinder.volume.drivers.xiv.XIVDriver"
+ZADARA_MODULE = "cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver"
 
 
 class VolumeDriverCompatibility(test.TestCase):
@@ -54,5 +67,109 @@ class VolumeDriverCompatibility(test.TestCase):
         self.assertEquals(self._driver_module_name(), SHEEPDOG_MODULE)
 
     def test_sheepdog_new(self):
-        self._load_driver('cinder.volume.drivers.sheepdog.SheepdogDriver')
+        self._load_driver(SHEEPDOG_MODULE)
         self.assertEquals(self._driver_module_name(), SHEEPDOG_MODULE)
+
+    def test_nexenta_old(self):
+        self._load_driver('cinder.volume.nexenta.volume.NexentaDriver')
+        self.assertEquals(self._driver_module_name(), NEXENTA_MODULE)
+
+    def test_nexenta_new(self):
+        self._load_driver(NEXENTA_MODULE)
+        self.assertEquals(self._driver_module_name(), NEXENTA_MODULE)
+
+    def test_san_old(self):
+        self._load_driver('cinder.volume.san.SanISCSIDriver')
+        self.assertEquals(self._driver_module_name(), SAN_MODULE)
+
+    def test_san_new(self):
+        self._load_driver(SAN_MODULE)
+        self.assertEquals(self._driver_module_name(), SAN_MODULE)
+
+    def test_solaris_old(self):
+        self._load_driver('cinder.volume.san.SolarisISCSIDriver')
+        self.assertEquals(self._driver_module_name(), SOLARIS_MODULE)
+
+    def test_solaris_new(self):
+        self._load_driver(SOLARIS_MODULE)
+        self.assertEquals(self._driver_module_name(), SOLARIS_MODULE)
+
+    def test_hp_lefthand_old(self):
+        self._load_driver('cinder.volume.san.HpSanISCSIDriver')
+        self.assertEquals(self._driver_module_name(), LEFTHAND_MODULE)
+
+    def test_hp_lefthand_new(self):
+        self._load_driver(LEFTHAND_MODULE)
+        self.assertEquals(self._driver_module_name(), LEFTHAND_MODULE)
+
+    def test_netapp_old(self):
+        self._load_driver('cinder.volume.netapp.NetAppISCSIDriver')
+        self.assertEquals(self._driver_module_name(), NETAPP_MODULE)
+
+    def test_netapp_new(self):
+        self._load_driver(NETAPP_MODULE)
+        self.assertEquals(self._driver_module_name(), NETAPP_MODULE)
+
+    def test_netapp_cmode_old(self):
+        self._load_driver('cinder.volume.netapp.NetAppCmodeISCSIDriver')
+        self.assertEquals(self._driver_module_name(), NETAPP_CMODE_MODULE)
+
+    def test_netapp_cmode_new(self):
+        self._load_driver(NETAPP_CMODE_MODULE)
+        self.assertEquals(self._driver_module_name(), NETAPP_CMODE_MODULE)
+
+    def test_netapp_nfs_old(self):
+        self._load_driver('cinder.volume.netapp_nfs.NetAppNFSDriver')
+        self.assertEquals(self._driver_module_name(), NETAPP_NFS_MODULE)
+
+    def test_netapp_nfs_new(self):
+        self._load_driver(NETAPP_NFS_MODULE)
+        self.assertEquals(self._driver_module_name(), NETAPP_NFS_MODULE)
+
+    def test_nfs_old(self):
+        self._load_driver('cinder.volume.nfs.NfsDriver')
+        self.assertEquals(self._driver_module_name(), NFS_MODULE)
+
+    def test_nfs_new(self):
+        self._load_driver(NFS_MODULE)
+        self.assertEquals(self._driver_module_name(), NFS_MODULE)
+
+    def test_solidfire_old(self):
+        self._load_driver('cinder.volume.solidfire.SolidFire')
+        self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE)
+
+    def test_solidfire_new(self):
+        self._load_driver(SOLIDFIRE_MODULE)
+        self.assertEquals(self._driver_module_name(), SOLIDFIRE_MODULE)
+
+    def test_storwize_svc_old(self):
+        self._load_driver('cinder.volume.storwize_svc.StorwizeSVCDriver')
+        self.assertEquals(self._driver_module_name(), STORWIZE_SVC_MODULE)
+
+    def test_storwize_svc_new(self):
+        self._load_driver(STORWIZE_SVC_MODULE)
+        self.assertEquals(self._driver_module_name(), STORWIZE_SVC_MODULE)
+
+    def test_windows_old(self):
+        self._load_driver('cinder.volume.windows.WindowsDriver')
+        self.assertEquals(self._driver_module_name(), WINDOWS_MODULE)
+
+    def test_windows_new(self):
+        self._load_driver(WINDOWS_MODULE)
+        self.assertEquals(self._driver_module_name(), WINDOWS_MODULE)
+
+    def test_xiv_old(self):
+        self._load_driver('cinder.volume.xiv.XIVDriver')
+        self.assertEquals(self._driver_module_name(), XIV_MODULE)
+
+    def test_xiv_new(self):
+        self._load_driver(XIV_MODULE)
+        self.assertEquals(self._driver_module_name(), XIV_MODULE)
+
+    def test_zadara_old(self):
+        self._load_driver('cinder.volume.zadara.ZadaraVPSAISCSIDriver')
+        self.assertEquals(self._driver_module_name(), ZADARA_MODULE)
+
+    def test_zadara_new(self):
+        self._load_driver(ZADARA_MODULE)
+        self.assertEquals(self._driver_module_name(), ZADARA_MODULE)
diff --git a/cinder/tests/test_netapp.py b/cinder/tests/test_netapp.py
index cbf0e57f3ad..753c72fcc62 100644
--- a/cinder/tests/test_netapp.py
+++ b/cinder/tests/test_netapp.py
@@ -27,7 +27,7 @@ from lxml import etree
 
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder.volume import netapp
+from cinder.volume.drivers import netapp
 
 LOG = logging.getLogger("cinder.volume.driver")
 
diff --git a/cinder/tests/test_netapp_nfs.py b/cinder/tests/test_netapp_nfs.py
index 939c7b720f9..c794be792e9 100644
--- a/cinder/tests/test_netapp_nfs.py
+++ b/cinder/tests/test_netapp_nfs.py
@@ -20,9 +20,9 @@ from cinder import context
 from cinder import exception
 from cinder import test
 
-from cinder.volume import netapp
-from cinder.volume import netapp_nfs
-from cinder.volume import nfs
+from cinder.volume.drivers import netapp
+from cinder.volume.drivers import netapp_nfs
+from cinder.volume.drivers import nfs
 from mox import IgnoreArg
 from mox import IsA
 from mox import MockObject
diff --git a/cinder/tests/test_nexenta.py b/cinder/tests/test_nexenta.py
index 1ed8e194ac2..986ff3a2a0b 100644
--- a/cinder/tests/test_nexenta.py
+++ b/cinder/tests/test_nexenta.py
@@ -24,9 +24,9 @@ import urllib2
 
 import cinder.flags
 import cinder.test
-from cinder.volume import nexenta
-from cinder.volume.nexenta import jsonrpc
-from cinder.volume.nexenta import volume
+from cinder.volume.drivers import nexenta
+from cinder.volume.drivers.nexenta import jsonrpc
+from cinder.volume.drivers.nexenta import volume
 
 FLAGS = cinder.flags.FLAGS
 
diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py
index f042b1a9f44..6a731633c9e 100644
--- a/cinder/tests/test_nfs.py
+++ b/cinder/tests/test_nfs.py
@@ -30,7 +30,7 @@ from cinder import exception
 from cinder.exception import ProcessExecutionError
 from cinder import test
 
-from cinder.volume import nfs
+from cinder.volume.drivers import nfs
 
 
 class DumbVolume(object):
diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py
index d6d0772b6c9..75658b34659 100644
--- a/cinder/tests/test_solidfire.py
+++ b/cinder/tests/test_solidfire.py
@@ -18,7 +18,7 @@
 from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder.volume.solidfire import SolidFire
+from cinder.volume.drivers.solidfire import SolidFire
 
 LOG = logging.getLogger(__name__)
 
diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py
index c1d308aa859..9824fa6e972 100644
--- a/cinder/tests/test_storwize_svc.py
+++ b/cinder/tests/test_storwize_svc.py
@@ -32,7 +32,7 @@ from cinder import flags
 from cinder.openstack.common import excutils
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder.volume import storwize_svc
+from cinder.volume.drivers import storwize_svc
 
 FLAGS = flags.FLAGS
 
diff --git a/cinder/tests/test_windows.py b/cinder/tests/test_windows.py
index c125fdd15ac..97062d3456e 100644
--- a/cinder/tests/test_windows.py
+++ b/cinder/tests/test_windows.py
@@ -24,7 +24,7 @@ import cinder.flags
 from cinder.tests.windows import basetestcase
 from cinder.tests.windows import db_fakes
 from cinder.tests.windows import windowsutils
-from cinder.volume import windows
+from cinder.volume.drivers import windows
 
 FLAGS = cinder.flags.FLAGS
 
diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py
index 222607f8a3d..f9189afa770 100644
--- a/cinder/tests/test_wsgi.py
+++ b/cinder/tests/test_wsgi.py
@@ -27,7 +27,6 @@ import webob.dec
 from cinder.api import openstack as openstack_api
 from cinder import exception
 from cinder import test
-from cinder.volume import xiv
 import cinder.wsgi
 
 
diff --git a/cinder/tests/test_xenapi_sm.py b/cinder/tests/test_xenapi_sm.py
index bc77526436b..d2a4ab48020 100644
--- a/cinder/tests/test_xenapi_sm.py
+++ b/cinder/tests/test_xenapi_sm.py
@@ -16,8 +16,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder.volume.xenapi import lib
-from cinder.volume import xenapi_sm as driver
+from cinder.volume.drivers.xenapi import lib
+from cinder.volume.drivers.xenapi import sm as driver
 import mox
 import unittest
 
diff --git a/cinder/tests/test_xiv.py b/cinder/tests/test_xiv.py
index 842cda4bee5..120dcd227ad 100644
--- a/cinder/tests/test_xiv.py
+++ b/cinder/tests/test_xiv.py
@@ -23,7 +23,7 @@
 from cinder import exception
 from cinder import flags
 from cinder import test
-from cinder.volume import xiv
+from cinder.volume.drivers import xiv
 
 
 FLAGS = flags.FLAGS
diff --git a/cinder/tests/test_zadara.py b/cinder/tests/test_zadara.py
index 8dab4419c83..642e0cffaba 100644
--- a/cinder/tests/test_zadara.py
+++ b/cinder/tests/test_zadara.py
@@ -25,7 +25,7 @@ import httplib
 from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder.volume import zadara
+from cinder.volume.drivers import zadara
 
 from lxml import etree
 
diff --git a/cinder/volume/netapp.py b/cinder/volume/drivers/netapp.py
similarity index 99%
rename from cinder/volume/netapp.py
rename to cinder/volume/drivers/netapp.py
index d40b190a7bc..1a2e489e420 100644
--- a/cinder/volume/netapp.py
+++ b/cinder/volume/drivers/netapp.py
@@ -36,7 +36,7 @@ from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume import volume_types
 
-LOG = logging.getLogger("cinder.volume.driver")
+LOG = logging.getLogger(__name__)
 
 netapp_opts = [
     cfg.StrOpt('netapp_wsdl_url',
diff --git a/cinder/volume/netapp_nfs.py b/cinder/volume/drivers/netapp_nfs.py
similarity index 98%
rename from cinder/volume/netapp_nfs.py
rename to cinder/volume/drivers/netapp_nfs.py
index 70605525efc..4a1e41b89b0 100644
--- a/cinder/volume/netapp_nfs.py
+++ b/cinder/volume/drivers/netapp_nfs.py
@@ -27,10 +27,10 @@ from cinder import exception
 from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
-from cinder.volume.netapp import netapp_opts
-from cinder.volume import nfs
+from cinder.volume.drivers.netapp import netapp_opts
+from cinder.volume.drivers import nfs
 
-LOG = logging.getLogger("cinder.volume.driver")
+LOG = logging.getLogger(__name__)
 
 netapp_nfs_opts = [
     cfg.IntOpt('synchronous_snapshot_create',
diff --git a/cinder/volume/nexenta/__init__.py b/cinder/volume/drivers/nexenta/__init__.py
similarity index 100%
rename from cinder/volume/nexenta/__init__.py
rename to cinder/volume/drivers/nexenta/__init__.py
diff --git a/cinder/volume/nexenta/jsonrpc.py b/cinder/volume/drivers/nexenta/jsonrpc.py
similarity index 97%
rename from cinder/volume/nexenta/jsonrpc.py
rename to cinder/volume/drivers/nexenta/jsonrpc.py
index 487b34c2338..2def096a280 100644
--- a/cinder/volume/nexenta/jsonrpc.py
+++ b/cinder/volume/drivers/nexenta/jsonrpc.py
@@ -26,9 +26,9 @@ import urllib2
 
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
-from cinder.volume import nexenta
+from cinder.volume.drivers import nexenta
 
-LOG = logging.getLogger("cinder.volume.nexenta.jsonrpc")
+LOG = logging.getLogger(__name__)
 
 
 class NexentaJSONException(nexenta.NexentaException):
diff --git a/cinder/volume/nexenta/volume.py b/cinder/volume/drivers/nexenta/volume.py
similarity index 98%
rename from cinder/volume/nexenta/volume.py
rename to cinder/volume/drivers/nexenta/volume.py
index 00e8b10f563..cf810f9e0f1 100644
--- a/cinder/volume/nexenta/volume.py
+++ b/cinder/volume/drivers/nexenta/volume.py
@@ -27,10 +27,10 @@ from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
-from cinder.volume import nexenta
-from cinder.volume.nexenta import jsonrpc
+from cinder.volume.drivers import nexenta
+from cinder.volume.drivers.nexenta import jsonrpc
 
-LOG = logging.getLogger("cinder.volume.nexenta.volume")
+LOG = logging.getLogger(__name__)
 FLAGS = flags.FLAGS
 
 nexenta_opts = [
diff --git a/cinder/volume/nfs.py b/cinder/volume/drivers/nfs.py
similarity index 99%
rename from cinder/volume/nfs.py
rename to cinder/volume/drivers/nfs.py
index 4ac5df418d8..8b2fc3be127 100644
--- a/cinder/volume/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -25,7 +25,7 @@ from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 
-LOG = logging.getLogger("cinder.volume.driver")
+LOG = logging.getLogger(__name__)
 
 volume_opts = [
     cfg.StrOpt('nfs_shares_config',
diff --git a/cinder/volume/san/__init__.py b/cinder/volume/drivers/san/__init__.py
similarity index 100%
rename from cinder/volume/san/__init__.py
rename to cinder/volume/drivers/san/__init__.py
diff --git a/cinder/volume/san/hp_lefthand.py b/cinder/volume/drivers/san/hp_lefthand.py
similarity index 99%
rename from cinder/volume/san/hp_lefthand.py
rename to cinder/volume/drivers/san/hp_lefthand.py
index bb452eb14ff..f40e648918a 100644
--- a/cinder/volume/san/hp_lefthand.py
+++ b/cinder/volume/drivers/san/hp_lefthand.py
@@ -23,7 +23,7 @@ from lxml import etree
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging
-from cinder.volume.san.san import SanISCSIDriver
+from cinder.volume.drivers.san.san import SanISCSIDriver
 
 
 LOG = logging.getLogger(__name__)
diff --git a/cinder/volume/san/san.py b/cinder/volume/drivers/san/san.py
similarity index 100%
rename from cinder/volume/san/san.py
rename to cinder/volume/drivers/san/san.py
diff --git a/cinder/volume/san/solaris.py b/cinder/volume/drivers/san/solaris.py
similarity index 99%
rename from cinder/volume/san/solaris.py
rename to cinder/volume/drivers/san/solaris.py
index 89403583a0d..9da84fae507 100644
--- a/cinder/volume/san/solaris.py
+++ b/cinder/volume/drivers/san/solaris.py
@@ -16,7 +16,7 @@ from cinder import exception
 from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
-from cinder.volume.san.san import SanISCSIDriver
+from cinder.volume.drivers.san.san import SanISCSIDriver
 
 
 LOG = logging.getLogger(__name__)
diff --git a/cinder/volume/solidfire.py b/cinder/volume/drivers/solidfire.py
similarity index 99%
rename from cinder/volume/solidfire.py
rename to cinder/volume/drivers/solidfire.py
index 78b57469cad..03b908da7be 100644
--- a/cinder/volume/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -33,7 +33,7 @@ from cinder import exception
 from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
-from cinder.volume.san.san import SanISCSIDriver
+from cinder.volume.drivers.san.san import SanISCSIDriver
 
 
 LOG = logging.getLogger(__name__)
diff --git a/cinder/volume/storwize_svc.py b/cinder/volume/drivers/storwize_svc.py
similarity index 99%
rename from cinder/volume/storwize_svc.py
rename to cinder/volume/drivers/storwize_svc.py
index c5df7f0af36..3a7f1373bac 100644
--- a/cinder/volume/storwize_svc.py
+++ b/cinder/volume/drivers/storwize_svc.py
@@ -49,7 +49,7 @@ from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import log as logging
-from cinder.volume.san import san
+from cinder.volume.drivers.san import san
 
 LOG = logging.getLogger(__name__)
 
diff --git a/cinder/volume/windows.py b/cinder/volume/drivers/windows.py
similarity index 99%
rename from cinder/volume/windows.py
rename to cinder/volume/drivers/windows.py
index 970ac7ccae0..a87a3c64a59 100644
--- a/cinder/volume/windows.py
+++ b/cinder/volume/drivers/windows.py
@@ -34,7 +34,7 @@ if os.name == 'nt':
     import wmi
 
 
-LOG = logging.getLogger("cinder.volume.windows.volume")
+LOG = logging.getLogger(__name__)
 
 FLAGS = flags.FLAGS
 
diff --git a/cinder/volume/drivers/xenapi/__init__.py b/cinder/volume/drivers/xenapi/__init__.py
new file mode 100644
index 00000000000..4549abf922e
--- /dev/null
+++ b/cinder/volume/drivers/xenapi/__init__.py
@@ -0,0 +1,13 @@
+#    Copyright 2012 OpenStack LLC
+#
+#    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.
diff --git a/cinder/volume/xenapi/lib.py b/cinder/volume/drivers/xenapi/lib.py
similarity index 100%
rename from cinder/volume/xenapi/lib.py
rename to cinder/volume/drivers/xenapi/lib.py
diff --git a/cinder/volume/xenapi_sm.py b/cinder/volume/drivers/xenapi/sm.py
similarity index 98%
rename from cinder/volume/xenapi_sm.py
rename to cinder/volume/drivers/xenapi/sm.py
index 362e572d600..8e767787bd2 100644
--- a/cinder/volume/xenapi_sm.py
+++ b/cinder/volume/drivers/xenapi/sm.py
@@ -19,7 +19,7 @@
 from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.volume import driver
-from cinder.volume.xenapi import lib as xenapi_lib
+from cinder.volume.drivers.xenapi import lib as xenapi_lib
 
 
 xenapi_opts = [
diff --git a/cinder/volume/xiv.py b/cinder/volume/drivers/xiv.py
similarity index 98%
rename from cinder/volume/xiv.py
rename to cinder/volume/drivers/xiv.py
index f4066bb9b59..1b16812bd35 100644
--- a/cinder/volume/xiv.py
+++ b/cinder/volume/drivers/xiv.py
@@ -29,7 +29,7 @@ from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
-from cinder.volume.san import san
+from cinder.volume.drivers.san import san
 
 ibm_xiv_opts = [
     cfg.StrOpt('xiv_proxy',
diff --git a/cinder/volume/zadara.py b/cinder/volume/drivers/zadara.py
similarity index 100%
rename from cinder/volume/zadara.py
rename to cinder/volume/drivers/zadara.py
diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index d07ff81b520..1956e6859d1 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -72,6 +72,32 @@ MAPPING = {
     'cinder.volume.driver.RBDDriver': 'cinder.volume.drivers.rbd.RBDDriver',
     'cinder.volume.driver.SheepdogDriver':
                             'cinder.volume.drivers.sheepdog.SheepdogDriver',
+    'cinder.volume.nexenta.volume.NexentaDriver':
+                        'cinder.volume.drivers.nexenta.volume.NexentaDriver',
+    'cinder.volume.san.SanISCSIDriver':
+                        'cinder.volume.drivers.san.san.SanISCSIDriver',
+    'cinder.volume.san.SolarisISCSIDriver':
+                        'cinder.volume.drivers.san.solaris.SolarisISCSIDriver',
+    'cinder.volume.san.HpSanISCSIDriver':
+                    'cinder.volume.drivers.san.hp_lefthand.HpSanISCSIDriver',
+    'cinder.volume.netapp.NetAppISCSIDriver':
+                        'cinder.volume.drivers.netapp.NetAppISCSIDriver',
+    'cinder.volume.netapp.NetAppCmodeISCSIDriver':
+                    'cinder.volume.drivers.netapp.NetAppCmodeISCSIDriver',
+    'cinder.volume.netapp_nfs.NetAppNFSDriver':
+                    'cinder.volume.drivers.netapp_nfs.NetAppNFSDriver',
+    'cinder.volume.nfs.NfsDriver':
+                        'cinder.volume.drivers.nfs.NfsDriver',
+    'cinder.volume.solidfire.SolidFire':
+                        'cinder.volume.drivers.solidfire.SolidFire',
+    'cinder.volume.storwize_svc.StorwizeSVCDriver':
+                        'cinder.volume.drivers.storwize_svc.StorwizeSVCDriver',
+    'cinder.volume.windows.WindowsDriver':
+                        'cinder.volume.drivers.windows.WindowsDriver',
+    'cinder.volume.xiv.XIVDriver':
+                            'cinder.volume.drivers.xiv.XIVDriver',
+    'cinder.volume.zadara.ZadaraVPSAISCSIDriver':
+                        'cinder.volume.drivers.zadara.ZadaraVPSAISCSIDriver'
     }
 
 
@@ -85,6 +111,8 @@ class VolumeManager(manager.SchedulerDependentManager):
         if not volume_driver:
             volume_driver = FLAGS.volume_driver
         if volume_driver in MAPPING:
+            LOG.warn(_("Driver path %s is deprecated, update your "
+                       "configuration to the new path."), volume_driver)
             self.driver = importutils.import_object(MAPPING[volume_driver])
         else:
             self.driver = importutils.import_object(volume_driver)
diff --git a/cinder/volume/xenapi/__init__.py b/cinder/volume/xenapi/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 5c720b40464..053d0b4576a 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -570,7 +570,7 @@
 #### (BoolOpt) if True will force update capabilities on each check
 
 
-######## defined in cinder.volume.netapp ########
+######## defined in cinder.volume.drivers.netapp ########
 
 # netapp_wsdl_url=<None>
 #### (StrOpt) URL of the WSDL file for the DFM server
@@ -599,7 +599,7 @@
 #### (StrOpt) Vfiler to use for provisioning
 
 
-######## defined in cinder.volume.netapp_nfs ########
+######## defined in cinder.volume.drivers.netapp_nfs ########
 
 # synchronous_snapshot_create=0
 #### (IntOpt) Does snapshot creation call returns immediately
@@ -631,7 +631,7 @@
 #### (StrOpt) Vfiler to use for provisioning
 
 
-######## defined in cinder.volume.nexenta.volume ########
+######## defined in cinder.volume.drivers.nexenta.volume ########
 
 # nexenta_host=
 #### (StrOpt) IP address of Nexenta SA
@@ -667,7 +667,7 @@
 #### (BoolOpt) flag to create sparse volumes
 
 
-######## defined in cinder.volume.nfs ########
+######## defined in cinder.volume.drivers.nfs ########
 
 # nfs_shares_config=<None>
 #### (StrOpt) File with the list of available nfs shares
@@ -684,7 +684,7 @@
 ####           volume creation takes a lot of time.
 
 
-######## defined in cinder.volume.san ########
+######## defined in cinder.volume.drivers.san.san ########
 
 # san_thin_provision=true
 #### (BoolOpt) Use thin provisioning for SAN volumes?
@@ -721,13 +721,13 @@
 #### (IntOpt) Maximum ssh connections in the pool
 
 
-######## defined in cinder.volume.solaris ########
+######## defined in cinder.volume.drivers.san.solaris ########
 
 # san_zfs_volume_base=rpool/
 #### (StrOpt) The ZFS path under which to create zvols for volumes.
 
 
-######## defined in cinder.volume.solidfire ########
+######## defined in cinder.volume.drivers.solidfire ########
 
 # sf_emulate_512=true
 #### (BoolOpt) Set 512 byte emulation on volume creation;
@@ -745,7 +745,7 @@
 #### (BoolOpt) Allow tenants to specify QOS on create
 
 
-######## defined in cinder.volume.storwize_svc ########
+######## defined in cinder.volume.drivers.storwize_svc ########
 
 # storwize_svc_volpool_name=volpool
 #### (StrOpt) Storage system storage pool for volumes
@@ -774,13 +774,13 @@
 ####          prepared. Maximum value is 600 seconds (10 minutes).
 
 
-######## defined in cinder.volume.xiv ########
+######## defined in cinder.volume.drivers.xiv ########
 
 # xiv_proxy=xiv_openstack.nova_proxy.XIVNovaProxy
 #### (StrOpt) Proxy driver
 
 
-######## defined in cinder.volume.zadara ########
+######## defined in cinder.volume.drivers.zadara ########
 
 # zadara_vpsa_ip=<None>
 #### (StrOpt) Management IP of Zadara VPSA