diff --git a/python/gtsam/__init__.py b/python/gtsam/__init__.py
index 8e093879c..f9e40517d 100644
--- a/python/gtsam/__init__.py
+++ b/python/gtsam/__init__.py
@@ -1,2 +1 @@
 from ._libgtsam_python import *
-from . import utils
\ No newline at end of file
diff --git a/python/gtsam_examples/VisualISAM2Example.py b/python/gtsam_examples/VisualISAM2Example.py
index a8be94719..3ba1d35f7 100644
--- a/python/gtsam_examples/VisualISAM2Example.py
+++ b/python/gtsam_examples/VisualISAM2Example.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
 import gtsam
-from gtsam.examples.SFMdata import *
-from gtsam.utils import *
+from gtsam_examples.SFMdata import *
+from gtsam_utils import *
 import matplotlib.pyplot as plt
 from mpl_toolkits.mplot3d import Axes3D
 import time # for sleep()
diff --git a/python/setup.py.in b/python/setup.py.in
index 359a5e8c3..d7e108e0a 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -8,6 +8,7 @@ setup(name='gtsam',
       author_email='frank.dellaert@gatech.edu',
       maintainer_email='gtsam@lists.gatech.edu',
       url='https://collab.cc.gatech.edu/borg/gtsam',
-      packages=['gtsam', 'gtsam.examples', 'gtsam.utils'],
+      package_dir={ '': '${CMAKE_CURRENT_SOURCE_DIR}' },
+      packages=['gtsam', 'gtsam_utils', 'gtsam_examples', 'gtsam_tests'],
       package_data={'gtsam' : ['_libgtsam_python.so']},
      )