diff --git a/obmc/mapper/__init__.py b/obmc/mapper/__init__.py
new file mode 100644
index 0000000..679b9c8
--- /dev/null
+++ b/obmc/mapper/__init__.py
@@ -0,0 +1,6 @@
+import obmc.mapper.bindings
+from obmc.mapper.bindings import Mapper
+from obmc.mapper.bindings import MAPPER_NAME
+from obmc.mapper.bindings import MAPPER_IFACE
+from obmc.mapper.bindings import MAPPER_PATH
+from obmc.mapper.bindings import MAPPER_NOT_FOUND
diff --git a/obmc/mapper.py b/obmc/mapper/bindings.py
similarity index 98%
rename from obmc/mapper.py
rename to obmc/mapper/bindings.py
index ab23524..f193a50 100644
--- a/obmc/mapper.py
+++ b/obmc/mapper/bindings.py
@@ -19,6 +19,7 @@
 import obmc.utils.misc
 import obmc.utils.pathtree
 
+
 MAPPER_NAME = 'org.openbmc.ObjectMapper'
 MAPPER_IFACE = MAPPER_NAME
 MAPPER_PATH = '/org/openbmc/ObjectMapper'
@@ -119,7 +120,7 @@
         try:
             ancestors.update({path: self.get_object(path)})
         except dbus.exceptions.DBusException, e:
-            if e.get_dbus_name() != obmc.mapper.MAPPER_NOT_FOUND:
+            if e.get_dbus_name() != MAPPER_NOT_FOUND:
                 raise
 
         for path, bus_data in ancestors.iteritems():
diff --git a/setup.py b/setup.py
index 9f704fd..9967f98 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from distutils.core import setup
 setup(name='phosphor-mapper',
       version='1.0',
-      py_modules=['obmc.mapper'],
+      packages=['obmc.mapper'],
       scripts=['phosphor-mapper']
       )