diff --git a/marconi/__init__.py b/marconi/__init__.py
index f538dddb7..0edfd9701 100644
--- a/marconi/__init__.py
+++ b/marconi/__init__.py
@@ -22,8 +22,8 @@ try:
 except NameError:
     import gettext
     gettext.install('marconi', unicode=1)
-    import marconi.bootstrap
-    Bootstrap = marconi.bootstrap.Bootstrap
+    import marconi.queues.bootstrap
+    Bootstrap = marconi.queues.bootstrap.Bootstrap
 
 import marconi.version
 
diff --git a/marconi/queues/__init__.py b/marconi/queues/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/marconi/bootstrap.py b/marconi/queues/bootstrap.py
similarity index 98%
rename from marconi/bootstrap.py
rename to marconi/queues/bootstrap.py
index 32dd04e93..6c9d768bd 100644
--- a/marconi/bootstrap.py
+++ b/marconi/queues/bootstrap.py
@@ -19,7 +19,7 @@ from marconi.common import config
 from marconi.common import decorators
 from marconi.common import exceptions
 from marconi.openstack.common import log
-from marconi import transport  # NOQA
+from marconi.queues import transport  # NOQA
 
 
 PROJECT_CFG = config.project('marconi')
diff --git a/marconi/storage/__init__.py b/marconi/queues/storage/__init__.py
similarity index 66%
rename from marconi/storage/__init__.py
rename to marconi/queues/storage/__init__.py
index 951436f6f..17aa6830e 100644
--- a/marconi/storage/__init__.py
+++ b/marconi/queues/storage/__init__.py
@@ -1,7 +1,7 @@
 """Marconi Storage Drivers"""
 
-from marconi.storage import base
-from marconi.storage import exceptions  # NOQA
+from marconi.queues.storage import base
+from marconi.queues.storage import exceptions  # NOQA
 
 
 # Hoist classes into package namespace
diff --git a/marconi/storage/base.py b/marconi/queues/storage/base.py
similarity index 100%
rename from marconi/storage/base.py
rename to marconi/queues/storage/base.py
diff --git a/marconi/storage/exceptions.py b/marconi/queues/storage/exceptions.py
similarity index 100%
rename from marconi/storage/exceptions.py
rename to marconi/queues/storage/exceptions.py
diff --git a/marconi/storage/mongodb/__init__.py b/marconi/queues/storage/mongodb/__init__.py
similarity index 67%
rename from marconi/storage/mongodb/__init__.py
rename to marconi/queues/storage/mongodb/__init__.py
index 605656424..8ece77119 100644
--- a/marconi/storage/mongodb/__init__.py
+++ b/marconi/queues/storage/mongodb/__init__.py
@@ -1,6 +1,6 @@
 """MongoDB Storage Driver for Marconi"""
 
-from marconi.storage.mongodb import driver
+from marconi.queues.storage.mongodb import driver
 
 # Hoist classes into package namespace
 Driver = driver.Driver
diff --git a/marconi/storage/mongodb/claims.py b/marconi/queues/storage/mongodb/claims.py
similarity index 98%
rename from marconi/storage/mongodb/claims.py
rename to marconi/queues/storage/mongodb/claims.py
index cfded92ee..073ebf29c 100644
--- a/marconi/storage/mongodb/claims.py
+++ b/marconi/queues/storage/mongodb/claims.py
@@ -26,9 +26,9 @@ from bson import objectid
 from marconi.common import config
 import marconi.openstack.common.log as logging
 from marconi.openstack.common import timeutils
-from marconi import storage
-from marconi.storage import exceptions
-from marconi.storage.mongodb import utils
+from marconi.queues import storage
+from marconi.queues.storage import exceptions
+from marconi.queues.storage.mongodb import utils
 
 LOG = logging.getLogger(__name__)
 CFG = config.namespace('limits:storage').from_options(
diff --git a/marconi/storage/mongodb/controllers.py b/marconi/queues/storage/mongodb/controllers.py
similarity index 86%
rename from marconi/storage/mongodb/controllers.py
rename to marconi/queues/storage/mongodb/controllers.py
index 056c0d9c6..804cdc452 100644
--- a/marconi/storage/mongodb/controllers.py
+++ b/marconi/queues/storage/mongodb/controllers.py
@@ -22,9 +22,9 @@ Field Mappings:
     updated and documented in each controller class.
 """
 
-from marconi.storage.mongodb import claims
-from marconi.storage.mongodb import messages
-from marconi.storage.mongodb import queues
+from marconi.queues.storage.mongodb import claims
+from marconi.queues.storage.mongodb import messages
+from marconi.queues.storage.mongodb import queues
 
 ClaimController = claims.ClaimController
 MessageController = messages.MessageController
diff --git a/marconi/storage/mongodb/driver.py b/marconi/queues/storage/mongodb/driver.py
similarity index 93%
rename from marconi/storage/mongodb/driver.py
rename to marconi/queues/storage/mongodb/driver.py
index 185ad80df..f7f56a6f7 100644
--- a/marconi/storage/mongodb/driver.py
+++ b/marconi/queues/storage/mongodb/driver.py
@@ -19,9 +19,9 @@ import pymongo
 import pymongo.errors
 
 from marconi.openstack.common import log as logging
-from marconi import storage
-from marconi.storage.mongodb import controllers
-from marconi.storage.mongodb import options
+from marconi.queues import storage
+from marconi.queues.storage.mongodb import controllers
+from marconi.queues.storage.mongodb import options
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/storage/mongodb/messages.py b/marconi/queues/storage/mongodb/messages.py
similarity index 99%
rename from marconi/storage/mongodb/messages.py
rename to marconi/queues/storage/mongodb/messages.py
index efb2ec99f..456e784e0 100644
--- a/marconi/storage/mongodb/messages.py
+++ b/marconi/queues/storage/mongodb/messages.py
@@ -29,10 +29,10 @@ import pymongo.read_preferences
 from marconi.common import config
 import marconi.openstack.common.log as logging
 from marconi.openstack.common import timeutils
-from marconi import storage
-from marconi.storage import exceptions
-from marconi.storage.mongodb import options
-from marconi.storage.mongodb import utils
+from marconi.queues import storage
+from marconi.queues.storage import exceptions
+from marconi.queues.storage.mongodb import options
+from marconi.queues.storage.mongodb import utils
 
 LOG = logging.getLogger(__name__)
 CFG = config.namespace('limits:storage').from_options(
diff --git a/marconi/storage/mongodb/options.py b/marconi/queues/storage/mongodb/options.py
similarity index 100%
rename from marconi/storage/mongodb/options.py
rename to marconi/queues/storage/mongodb/options.py
diff --git a/marconi/storage/mongodb/queues.py b/marconi/queues/storage/mongodb/queues.py
similarity index 97%
rename from marconi/storage/mongodb/queues.py
rename to marconi/queues/storage/mongodb/queues.py
index 5aee9b34b..4726c883c 100644
--- a/marconi/storage/mongodb/queues.py
+++ b/marconi/queues/storage/mongodb/queues.py
@@ -26,9 +26,9 @@ import pymongo.errors
 from marconi.common import config
 import marconi.openstack.common.log as logging
 from marconi.openstack.common import timeutils
-from marconi import storage
-from marconi.storage import exceptions
-from marconi.storage.mongodb import utils
+from marconi.queues import storage
+from marconi.queues.storage import exceptions
+from marconi.queues.storage.mongodb import utils
 
 LOG = logging.getLogger(__name__)
 CFG = config.namespace('limits:storage').from_options(
diff --git a/marconi/storage/mongodb/utils.py b/marconi/queues/storage/mongodb/utils.py
similarity index 98%
rename from marconi/storage/mongodb/utils.py
rename to marconi/queues/storage/mongodb/utils.py
index d9d43451c..88847bcd1 100644
--- a/marconi/storage/mongodb/utils.py
+++ b/marconi/queues/storage/mongodb/utils.py
@@ -27,7 +27,7 @@ from pymongo import errors
 from marconi.common import exceptions
 import marconi.openstack.common.log as logging
 from marconi.openstack.common import timeutils
-from marconi.storage import exceptions as storage_exceptions
+from marconi.queues.storage import exceptions as storage_exceptions
 
 
 DUP_MARKER_REGEX = re.compile(r'\$queue_marker.*?:\s(\d+)')
diff --git a/marconi/storage/sqlite/__init__.py b/marconi/queues/storage/sqlite/__init__.py
similarity index 79%
rename from marconi/storage/sqlite/__init__.py
rename to marconi/queues/storage/sqlite/__init__.py
index f34c416b9..4a21aff05 100644
--- a/marconi/storage/sqlite/__init__.py
+++ b/marconi/queues/storage/sqlite/__init__.py
@@ -4,7 +4,7 @@ In-memory reference Storage Driver for Marconi.
 Useful for automated testing and for prototyping storage driver concepts.
 """
 
-from marconi.storage.sqlite import driver
+from marconi.queues.storage.sqlite import driver
 
 # Hoist classes into package namespace
 Driver = driver.Driver
diff --git a/marconi/storage/sqlite/claims.py b/marconi/queues/storage/sqlite/claims.py
similarity index 97%
rename from marconi/storage/sqlite/claims.py
rename to marconi/queues/storage/sqlite/claims.py
index 92aa7c8d5..7ba6c212e 100644
--- a/marconi/storage/sqlite/claims.py
+++ b/marconi/queues/storage/sqlite/claims.py
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 from marconi.common import config
-from marconi.storage import base
-from marconi.storage import exceptions
-from marconi.storage.sqlite import utils
+from marconi.queues.storage import base
+from marconi.queues.storage import exceptions
+from marconi.queues.storage.sqlite import utils
 
 CFG = config.namespace('limits:storage').from_options(
     default_message_paging=10,
diff --git a/marconi/storage/sqlite/controllers.py b/marconi/queues/storage/sqlite/controllers.py
similarity index 83%
rename from marconi/storage/sqlite/controllers.py
rename to marconi/queues/storage/sqlite/controllers.py
index 31ebaf8e1..18e393d9b 100644
--- a/marconi/storage/sqlite/controllers.py
+++ b/marconi/queues/storage/sqlite/controllers.py
@@ -16,9 +16,9 @@
 
 """Exports SQLite driver controllers."""
 
-from marconi.storage.sqlite import claims
-from marconi.storage.sqlite import messages
-from marconi.storage.sqlite import queues
+from marconi.queues.storage.sqlite import claims
+from marconi.queues.storage.sqlite import messages
+from marconi.queues.storage.sqlite import queues
 
 ClaimController = claims.ClaimController
 MessageController = messages.MessageController
diff --git a/marconi/storage/sqlite/driver.py b/marconi/queues/storage/sqlite/driver.py
similarity index 96%
rename from marconi/storage/sqlite/driver.py
rename to marconi/queues/storage/sqlite/driver.py
index 911284168..6ca9f62e0 100644
--- a/marconi/storage/sqlite/driver.py
+++ b/marconi/queues/storage/sqlite/driver.py
@@ -19,9 +19,9 @@ import sqlite3
 import msgpack
 
 from marconi.common import config
-from marconi import storage
-from marconi.storage.sqlite import controllers
-from marconi.storage.sqlite import utils
+from marconi.queues import storage
+from marconi.queues.storage.sqlite import controllers
+from marconi.queues.storage.sqlite import utils
 
 CFG = config.namespace('drivers:storage:sqlite').from_options(
     database=':memory:')
diff --git a/marconi/storage/sqlite/messages.py b/marconi/queues/storage/sqlite/messages.py
similarity index 98%
rename from marconi/storage/sqlite/messages.py
rename to marconi/queues/storage/sqlite/messages.py
index 600b0143d..46f15c8d0 100644
--- a/marconi/storage/sqlite/messages.py
+++ b/marconi/queues/storage/sqlite/messages.py
@@ -15,9 +15,9 @@
 
 from marconi.common import config
 from marconi.openstack.common import timeutils
-from marconi.storage import base
-from marconi.storage import exceptions
-from marconi.storage.sqlite import utils
+from marconi.queues.storage import base
+from marconi.queues.storage import exceptions
+from marconi.queues.storage.sqlite import utils
 
 CFG = config.namespace('limits:storage').from_options(
     default_message_paging=10,
diff --git a/marconi/storage/sqlite/queues.py b/marconi/queues/storage/sqlite/queues.py
similarity index 97%
rename from marconi/storage/sqlite/queues.py
rename to marconi/queues/storage/sqlite/queues.py
index e4fc7dd32..43438dc5a 100644
--- a/marconi/storage/sqlite/queues.py
+++ b/marconi/queues/storage/sqlite/queues.py
@@ -15,9 +15,9 @@
 # limitations under the License.
 
 from marconi.common import config
-from marconi.storage import base
-from marconi.storage import exceptions
-from marconi.storage.sqlite import utils
+from marconi.queues.storage import base
+from marconi.queues.storage import exceptions
+from marconi.queues.storage.sqlite import utils
 
 CFG = config.namespace('limits:storage').from_options(
     default_queue_paging=10,
diff --git a/marconi/storage/sqlite/utils.py b/marconi/queues/storage/sqlite/utils.py
similarity index 97%
rename from marconi/storage/sqlite/utils.py
rename to marconi/queues/storage/sqlite/utils.py
index 11eb29ef4..d2461fd12 100644
--- a/marconi/storage/sqlite/utils.py
+++ b/marconi/queues/storage/sqlite/utils.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.storage import exceptions
+from marconi.queues.storage import exceptions
 
 UNIX_EPOCH_AS_JULIAN_SEC = 2440587.5 * 86400.0
 
diff --git a/marconi/transport/__init__.py b/marconi/queues/transport/__init__.py
similarity index 84%
rename from marconi/transport/__init__.py
rename to marconi/queues/transport/__init__.py
index 4b711ba54..cec61b92b 100644
--- a/marconi/transport/__init__.py
+++ b/marconi/queues/transport/__init__.py
@@ -1,7 +1,7 @@
 """Marconi Transport Drivers"""
 
 from marconi.common import config
-from marconi.transport import base
+from marconi.queues.transport import base
 
 OPTIONS = {
     'auth_strategy': ""
diff --git a/marconi/transport/auth.py b/marconi/queues/transport/auth.py
similarity index 100%
rename from marconi/transport/auth.py
rename to marconi/queues/transport/auth.py
diff --git a/marconi/transport/base.py b/marconi/queues/transport/base.py
similarity index 100%
rename from marconi/transport/base.py
rename to marconi/queues/transport/base.py
diff --git a/marconi/transport/utils.py b/marconi/queues/transport/utils.py
similarity index 100%
rename from marconi/transport/utils.py
rename to marconi/queues/transport/utils.py
diff --git a/marconi/transport/validation.py b/marconi/queues/transport/validation.py
similarity index 100%
rename from marconi/transport/validation.py
rename to marconi/queues/transport/validation.py
diff --git a/marconi/queues/transport/wsgi/__init__.py b/marconi/queues/transport/wsgi/__init__.py
new file mode 100644
index 000000000..d268cda88
--- /dev/null
+++ b/marconi/queues/transport/wsgi/__init__.py
@@ -0,0 +1,11 @@
+"""WSGI Transport Driver"""
+
+from marconi.queues.transport.wsgi import claims  # NOQA
+from marconi.queues.transport.wsgi import driver
+from marconi.queues.transport.wsgi import messages  # NOQA
+from marconi.queues.transport.wsgi import queues  # NOQA
+from marconi.queues.transport.wsgi import stats  # NOQA
+
+
+# Hoist into package namespace
+Driver = driver.Driver
diff --git a/marconi/transport/wsgi/app.py b/marconi/queues/transport/wsgi/app.py
similarity index 96%
rename from marconi/transport/wsgi/app.py
rename to marconi/queues/transport/wsgi/app.py
index b5aa757cf..84b586567 100644
--- a/marconi/transport/wsgi/app.py
+++ b/marconi/queues/transport/wsgi/app.py
@@ -26,6 +26,6 @@ no common way to specify / pass configuration files
 to the WSGI app when it is called from other apps.
 """
 
-from marconi import bootstrap
+from marconi.queues import bootstrap
 
 app = bootstrap.Bootstrap().transport.app
diff --git a/marconi/transport/wsgi/claims.py b/marconi/queues/transport/wsgi/claims.py
similarity index 96%
rename from marconi/transport/wsgi/claims.py
rename to marconi/queues/transport/wsgi/claims.py
index 4ff2b2101..38e7763cd 100644
--- a/marconi/transport/wsgi/claims.py
+++ b/marconi/queues/transport/wsgi/claims.py
@@ -18,11 +18,11 @@ import falcon
 from marconi.common import config
 from marconi.common import exceptions as input_exceptions
 import marconi.openstack.common.log as logging
-from marconi.storage import exceptions as storage_exceptions
-from marconi.transport import utils
-from marconi.transport import validation as validate
-from marconi.transport.wsgi import exceptions as wsgi_exceptions
-from marconi.transport.wsgi import utils as wsgi_utils
+from marconi.queues.storage import exceptions as storage_exceptions
+from marconi.queues.transport import utils
+from marconi.queues.transport import validation as validate
+from marconi.queues.transport.wsgi import exceptions as wsgi_exceptions
+from marconi.queues.transport.wsgi import utils as wsgi_utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/transport/wsgi/driver.py b/marconi/queues/transport/wsgi/driver.py
similarity index 91%
rename from marconi/transport/wsgi/driver.py
rename to marconi/queues/transport/wsgi/driver.py
index 38e4e5a8e..8bb9fb8ea 100644
--- a/marconi/transport/wsgi/driver.py
+++ b/marconi/queues/transport/wsgi/driver.py
@@ -18,15 +18,15 @@ from wsgiref import simple_server
 
 from marconi.common import config
 import marconi.openstack.common.log as logging
-from marconi import transport
-from marconi.transport import auth
-from marconi.transport.wsgi import claims
-from marconi.transport.wsgi import health
-from marconi.transport.wsgi import messages
-from marconi.transport.wsgi import metadata
-from marconi.transport.wsgi import queues
-from marconi.transport.wsgi import stats
-from marconi.transport.wsgi import v1
+from marconi.queues import transport
+from marconi.queues.transport import auth
+from marconi.queues.transport.wsgi import claims
+from marconi.queues.transport.wsgi import health
+from marconi.queues.transport.wsgi import messages
+from marconi.queues.transport.wsgi import metadata
+from marconi.queues.transport.wsgi import queues
+from marconi.queues.transport.wsgi import stats
+from marconi.queues.transport.wsgi import v1
 
 OPTIONS = {
     'bind': '0.0.0.0',
diff --git a/marconi/transport/wsgi/exceptions.py b/marconi/queues/transport/wsgi/exceptions.py
similarity index 100%
rename from marconi/transport/wsgi/exceptions.py
rename to marconi/queues/transport/wsgi/exceptions.py
diff --git a/marconi/transport/wsgi/health.py b/marconi/queues/transport/wsgi/health.py
similarity index 100%
rename from marconi/transport/wsgi/health.py
rename to marconi/queues/transport/wsgi/health.py
diff --git a/marconi/transport/wsgi/messages.py b/marconi/queues/transport/wsgi/messages.py
similarity index 97%
rename from marconi/transport/wsgi/messages.py
rename to marconi/queues/transport/wsgi/messages.py
index 11e713b50..5f030c017 100644
--- a/marconi/transport/wsgi/messages.py
+++ b/marconi/queues/transport/wsgi/messages.py
@@ -17,11 +17,11 @@ import falcon
 from marconi.common import config
 from marconi.common import exceptions as input_exceptions
 import marconi.openstack.common.log as logging
-from marconi.storage import exceptions as storage_exceptions
-from marconi.transport import utils
-from marconi.transport import validation as validate
-from marconi.transport.wsgi import exceptions as wsgi_exceptions
-from marconi.transport.wsgi import utils as wsgi_utils
+from marconi.queues.storage import exceptions as storage_exceptions
+from marconi.queues.transport import utils
+from marconi.queues.transport import validation as validate
+from marconi.queues.transport.wsgi import exceptions as wsgi_exceptions
+from marconi.queues.transport.wsgi import utils as wsgi_utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/transport/wsgi/metadata.py b/marconi/queues/transport/wsgi/metadata.py
similarity index 91%
rename from marconi/transport/wsgi/metadata.py
rename to marconi/queues/transport/wsgi/metadata.py
index b38dffbdd..6251faffd 100644
--- a/marconi/transport/wsgi/metadata.py
+++ b/marconi/queues/transport/wsgi/metadata.py
@@ -18,11 +18,11 @@ import falcon
 from marconi.common import config
 from marconi.common import exceptions as input_exceptions
 import marconi.openstack.common.log as logging
-from marconi.storage import exceptions as storage_exceptions
-from marconi.transport import utils
-from marconi.transport import validation as validate
-from marconi.transport.wsgi import exceptions as wsgi_exceptions
-from marconi.transport.wsgi import utils as wsgi_utils
+from marconi.queues.storage import exceptions as storage_exceptions
+from marconi.queues.transport import utils
+from marconi.queues.transport import validation as validate
+from marconi.queues.transport.wsgi import exceptions as wsgi_exceptions
+from marconi.queues.transport.wsgi import utils as wsgi_utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/transport/wsgi/queues.py b/marconi/queues/transport/wsgi/queues.py
similarity index 96%
rename from marconi/transport/wsgi/queues.py
rename to marconi/queues/transport/wsgi/queues.py
index 644a7210e..61b7b9a00 100644
--- a/marconi/transport/wsgi/queues.py
+++ b/marconi/queues/transport/wsgi/queues.py
@@ -17,9 +17,9 @@ import falcon
 
 from marconi.common import exceptions as input_exceptions
 import marconi.openstack.common.log as logging
-from marconi.transport import utils
-from marconi.transport import validation as validate
-from marconi.transport.wsgi import exceptions as wsgi_exceptions
+from marconi.queues.transport import utils
+from marconi.queues.transport import validation as validate
+from marconi.queues.transport.wsgi import exceptions as wsgi_exceptions
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/transport/wsgi/stats.py b/marconi/queues/transport/wsgi/stats.py
similarity index 91%
rename from marconi/transport/wsgi/stats.py
rename to marconi/queues/transport/wsgi/stats.py
index fcb36ab1b..f058cdcd5 100644
--- a/marconi/transport/wsgi/stats.py
+++ b/marconi/queues/transport/wsgi/stats.py
@@ -16,9 +16,9 @@
 import falcon
 
 import marconi.openstack.common.log as logging
-from marconi.storage import exceptions as storage_exceptions
-from marconi.transport import utils
-from marconi.transport.wsgi import exceptions as wsgi_exceptions
+from marconi.queues.storage import exceptions as storage_exceptions
+from marconi.queues.transport import utils
+from marconi.queues.transport.wsgi import exceptions as wsgi_exceptions
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/transport/wsgi/utils.py b/marconi/queues/transport/wsgi/utils.py
similarity index 98%
rename from marconi/transport/wsgi/utils.py
rename to marconi/queues/transport/wsgi/utils.py
index 78af1bc56..67a7fa2d7 100644
--- a/marconi/transport/wsgi/utils.py
+++ b/marconi/queues/transport/wsgi/utils.py
@@ -16,8 +16,8 @@
 
 import marconi.openstack.common.log as logging
 
-from marconi.transport import utils
-from marconi.transport.wsgi import exceptions
+from marconi.queues.transport import utils
+from marconi.queues.transport.wsgi import exceptions
 
 
 JSONObject = dict
diff --git a/marconi/transport/wsgi/v1.py b/marconi/queues/transport/wsgi/v1.py
similarity index 100%
rename from marconi/transport/wsgi/v1.py
rename to marconi/queues/transport/wsgi/v1.py
diff --git a/marconi/transport/zmq/__init__.py b/marconi/queues/transport/zmq/__init__.py
similarity index 100%
rename from marconi/transport/zmq/__init__.py
rename to marconi/queues/transport/zmq/__init__.py
diff --git a/marconi/tests/faulty_storage.py b/marconi/tests/faulty_storage.py
index f3724f3be..3180acd84 100644
--- a/marconi/tests/faulty_storage.py
+++ b/marconi/tests/faulty_storage.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from marconi import storage
+from marconi.queues import storage
 
 
 class Driver(storage.DriverBase):
diff --git a/marconi/tests/functional/base.py b/marconi/tests/functional/base.py
index 7e6423951..5d052955e 100644
--- a/marconi/tests/functional/base.py
+++ b/marconi/tests/functional/base.py
@@ -17,15 +17,15 @@
 import abc
 import multiprocessing
 
-from marconi import bootstrap
+from marconi.queues import bootstrap
+# NOTE(flaper87): This is necessary to register,
+# wsgi configs and won't be permanent. It'll be
+# refactored as part of the work for this blueprint
+from marconi.queues.transport import wsgi  # noqa
 from marconi import tests as testing
 from marconi.tests.functional import config
 from marconi.tests.functional import helpers
 from marconi.tests.functional import http
-# NOTE(flaper87): This is necessary to register,
-# wsgi configs and won't be permanent. It'll be
-# refactored as part of the work for this blueprint
-from marconi.transport import wsgi  # noqa
 
 
 class FunctionalTestBase(testing.TestBase):
diff --git a/marconi/transport/wsgi/__init__.py b/marconi/transport/wsgi/__init__.py
deleted file mode 100644
index 019555839..000000000
--- a/marconi/transport/wsgi/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""WSGI Transport Driver"""
-
-from marconi.transport.wsgi import claims  # NOQA
-from marconi.transport.wsgi import driver
-from marconi.transport.wsgi import messages  # NOQA
-from marconi.transport.wsgi import queues  # NOQA
-from marconi.transport.wsgi import stats  # NOQA
-
-
-# Hoist into package namespace
-Driver = driver.Driver
diff --git a/setup.cfg b/setup.cfg
index 7b6f01924..f099b1afe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,11 +31,11 @@ console_scripts =
     marconi-server = marconi.cmd.server:run
 
 marconi.storage =
-    sqlite = marconi.storage.sqlite.driver:Driver
-    mongodb = marconi.storage.mongodb.driver:Driver
+    sqlite = marconi.queues.storage.sqlite.driver:Driver
+    mongodb = marconi.queues.storage.mongodb.driver:Driver
 
 marconi.transport =
-    wsgi = marconi.transport.wsgi.driver:Driver
+    wsgi = marconi.queues.transport.wsgi.driver:Driver
 
 marconi.common.cache.backends =
     memory = marconi.common.cache._backends.memory:MemoryBackend
diff --git a/tests/unit/storage/base.py b/tests/unit/storage/base.py
index b5bfbcd7d..956764014 100644
--- a/tests/unit/storage/base.py
+++ b/tests/unit/storage/base.py
@@ -18,8 +18,8 @@ import time
 from testtools import matchers
 
 from marconi.openstack.common import timeutils
-from marconi import storage
-from marconi.storage import exceptions
+from marconi.queues import storage
+from marconi.queues.storage import exceptions
 from marconi import tests as testing
 
 
diff --git a/tests/unit/storage/test_impl_mongodb.py b/tests/unit/storage/test_impl_mongodb.py
index f123aa286..9fe27e5f5 100644
--- a/tests/unit/storage/test_impl_mongodb.py
+++ b/tests/unit/storage/test_impl_mongodb.py
@@ -22,11 +22,11 @@ import pymongo.errors
 from testtools import matchers
 
 from marconi.common import exceptions
-from marconi import storage
-from marconi.storage import mongodb
-from marconi.storage.mongodb import controllers
-from marconi.storage.mongodb import options as mongodb_options
-from marconi.storage.mongodb import utils
+from marconi.queues import storage
+from marconi.queues.storage import mongodb
+from marconi.queues.storage.mongodb import controllers
+from marconi.queues.storage.mongodb import options as mongodb_options
+from marconi.queues.storage.mongodb import utils
 from marconi import tests as testing
 
 import base  # noqa  # noqa
diff --git a/tests/unit/storage/test_impl_sqlite.py b/tests/unit/storage/test_impl_sqlite.py
index 9cd0dd0a2..cdd97ab4e 100644
--- a/tests/unit/storage/test_impl_sqlite.py
+++ b/tests/unit/storage/test_impl_sqlite.py
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi import storage
-from marconi.storage import sqlite
-from marconi.storage.sqlite import controllers
+from marconi.queues import storage
+from marconi.queues.storage import sqlite
+from marconi.queues.storage.sqlite import controllers
 
 import base  # noqa
 
diff --git a/tests/unit/test_bootstrap.py b/tests/unit/test_bootstrap.py
index 51ffdf647..348fdb7fe 100644
--- a/tests/unit/test_bootstrap.py
+++ b/tests/unit/test_bootstrap.py
@@ -15,11 +15,11 @@
 
 from oslo.config import cfg
 
-import marconi
 from marconi.common import exceptions
-from marconi.storage import sqlite
+import marconi.queues
+from marconi.queues.storage import sqlite
+from marconi.queues.transport import wsgi
 from marconi.tests import base
-from marconi.transport import wsgi
 
 
 class TestBootstrap(base.TestBase):
diff --git a/tests/unit/transport/test_auth.py b/tests/unit/transport/test_auth.py
index 9b3d37ccd..e8170df8f 100644
--- a/tests/unit/transport/test_auth.py
+++ b/tests/unit/transport/test_auth.py
@@ -17,8 +17,8 @@
 from oslo.config import cfg
 
 from marconi.common import config
+from marconi.queues.transport import auth
 from marconi import tests as testing
-from marconi.transport import auth
 
 
 class TestTransportAuth(testing.TestBase):
diff --git a/tests/unit/transport/wsgi/base.py b/tests/unit/transport/wsgi/base.py
index 44587f4fd..e92b34acf 100644
--- a/tests/unit/transport/wsgi/base.py
+++ b/tests/unit/transport/wsgi/base.py
@@ -16,7 +16,7 @@
 
 from falcon import testing as ftest
 
-import marconi
+import marconi.queues
 from marconi import tests as testing
 from marconi.tests import faulty_storage
 
diff --git a/tests/unit/transport/wsgi/test_utils.py b/tests/unit/transport/wsgi/test_utils.py
index 9eda06052..eaac52fe6 100644
--- a/tests/unit/transport/wsgi/test_utils.py
+++ b/tests/unit/transport/wsgi/test_utils.py
@@ -20,7 +20,7 @@ import falcon
 import json
 import testtools
 
-from marconi.transport.wsgi import utils
+from marconi.queues.transport.wsgi import utils
 
 
 class TestWSGIutils(testtools.TestCase):