diff --git a/cython/build.sh b/cython/build.sh
index d938f120d..a0505936b 100755
--- a/cython/build.sh
+++ b/cython/build.sh
@@ -5,6 +5,7 @@ set -e
 set -x
 
 #usage: wrap [--matlab|--cython] absoluteInterfacePath moduleName toolboxPath headerPath
-wrap --cython $PWD gtsam $PWD ../
+wrap --cython $PWD gtsam $PWD/gtsam ../
 
 python setup.py build_ext --inplace
+python -m unittest discover
diff --git a/cython/gtsam/__init__.py b/cython/gtsam/__init__.py
new file mode 100644
index 000000000..ea22fd543
--- /dev/null
+++ b/cython/gtsam/__init__.py
@@ -0,0 +1 @@
+from gtsam import *
\ No newline at end of file
diff --git a/cython/setup.py b/cython/setup.py
index 009f62c5c..6ae3ac870 100644
--- a/cython/setup.py
+++ b/cython/setup.py
@@ -3,12 +3,10 @@ from distutils.extension import Extension
 from Cython.Build import cythonize
 import eigency
 
-
-
 setup(
   ext_modules = cythonize(Extension(
     "gtsam",
-    sources=["gtsam.pyx"],
+    sources=["gtsam/gtsam.pyx"],
     include_dirs = ["/Users/dta-huynh/install/include",
                     "/Users/dta-huynh/install/include/gtsam/3rdparty/Eigen",
                     "/usr/local/include"] + eigency.get_includes(include_eigen=False),