diff --git a/.gitignore b/.gitignore
index ae1b50b29..9d04f5d07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ venv
 .venv
 *.sublime-workspace
 *.sqlite
+.DS_Store
 .testrepository
 versioninfo
 var/*
diff --git a/marconi/common/__init__.py b/marconi/common/__init__.py
new file mode 100644
index 000000000..d7ec39ab2
--- /dev/null
+++ b/marconi/common/__init__.py
@@ -0,0 +1,3 @@
+""" Code common to Marconi, including main application logic. """
+
+from .kernel import Kernel  # NOQA
diff --git a/marconi/storage/__init__.py b/marconi/storage/__init__.py
new file mode 100644
index 000000000..d19148d79
--- /dev/null
+++ b/marconi/storage/__init__.py
@@ -0,0 +1 @@
+""" Marconi Storage Drivers """
diff --git a/marconi/storage/mongodb/__init__.py b/marconi/storage/mongodb/__init__.py
new file mode 100644
index 000000000..45640ee31
--- /dev/null
+++ b/marconi/storage/mongodb/__init__.py
@@ -0,0 +1 @@
+""" MongoDB Storage Driver for Marconi """
diff --git a/marconi/storage/reference/__init__.py b/marconi/storage/reference/__init__.py
new file mode 100644
index 000000000..427509af5
--- /dev/null
+++ b/marconi/storage/reference/__init__.py
@@ -0,0 +1,5 @@
+"""In-memory reference Storage Driver for Marconi.
+
+Useful for automated testing and for prototyping storage driver concepts.
+
+"""
diff --git a/marconi/transport/__init__.py b/marconi/transport/__init__.py
new file mode 100644
index 000000000..4d46dfd22
--- /dev/null
+++ b/marconi/transport/__init__.py
@@ -0,0 +1 @@
+""" Marconi Transport Modules """
diff --git a/marconi/transport/wsgi/__init__.py b/marconi/transport/wsgi/__init__.py
new file mode 100644
index 000000000..94e21f255
--- /dev/null
+++ b/marconi/transport/wsgi/__init__.py
@@ -0,0 +1 @@
+""" WSGI Transport """
diff --git a/marconi/transport/zmq/__init__.py b/marconi/transport/zmq/__init__.py
new file mode 100644
index 000000000..8ce757d64
--- /dev/null
+++ b/marconi/transport/zmq/__init__.py
@@ -0,0 +1 @@
+""" ZMQ Transport (Experimental) """