diff --git a/bin/marconi-self-host b/bin/marconi-self-host
index 4342c458d..4487957f8 100644
--- a/bin/marconi-self-host
+++ b/bin/marconi-self-host
@@ -28,7 +28,8 @@ kernel with the WSGI transport and export the WSGI app callable, e.g.:
 """
 
 import logging.config
-from marconi.common import Kernel
+
+import marconi
 
 
 if __name__ == '__main__':
@@ -37,5 +38,5 @@ if __name__ == '__main__':
     config_file = '/etc/marconi/marconi.conf'
 
     logging.config.fileConfig(logging_config_file)
-    kernel = Kernel(config_file)
+    kernel = marconi.Kernel(config_file)
     kernel.run()
diff --git a/marconi/__init__.py b/marconi/__init__.py
index 8d4171633..d42c84c85 100644
--- a/marconi/__init__.py
+++ b/marconi/__init__.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from marconi.kernel import Kernel
 import marconi.version
 
 __version__ = marconi.version.version_info.deferred_version_string()
diff --git a/marconi/common/__init__.py b/marconi/common/__init__.py
index 5eb06c3bc..29ada70bd 100644
--- a/marconi/common/__init__.py
+++ b/marconi/common/__init__.py
@@ -1,3 +1 @@
-"""Code common to Marconi, including main application logic."""
-
-from .kernel import Kernel  # NOQA
+"""Code common to Marconi"""
diff --git a/marconi/common/kernel.py b/marconi/kernel.py
similarity index 100%
rename from marconi/common/kernel.py
rename to marconi/kernel.py
diff --git a/marconi/tests/test_simple.py b/marconi/tests/test_simple.py
index 0c3a8598d..eda23dc12 100644
--- a/marconi/tests/test_simple.py
+++ b/marconi/tests/test_simple.py
@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import marconi.tests.util as util
-import marconi.common
+import marconi
+from marconi.tests import util
 
 
 class TestSimple(util.TestSuite):
@@ -21,7 +21,7 @@ class TestSimple(util.TestSuite):
     def test_simple(self):
         """Doesn't really test much"""
         conf_file = self.conf_path('wsgi_reference.conf')
-        kernel = marconi.common.Kernel(conf_file)
+        kernel = marconi.Kernel(conf_file)
         transport = kernel.transport
         wsgi_app = transport.app
         self.assertTrue(True)