diff --git a/cython/CMakeLists.txt b/python/CMakeLists.txt
similarity index 100%
rename from cython/CMakeLists.txt
rename to python/CMakeLists.txt
diff --git a/cython/README.md b/python/README.md
similarity index 100%
rename from cython/README.md
rename to python/README.md
diff --git a/cython/gtsam/__init__.py b/python/gtsam/__init__.py
similarity index 100%
rename from cython/gtsam/__init__.py
rename to python/gtsam/__init__.py
diff --git a/cython/gtsam/examples/DogLegOptimizerExample.py b/python/gtsam/examples/DogLegOptimizerExample.py
similarity index 100%
rename from cython/gtsam/examples/DogLegOptimizerExample.py
rename to python/gtsam/examples/DogLegOptimizerExample.py
diff --git a/cython/gtsam/examples/GPSFactorExample.py b/python/gtsam/examples/GPSFactorExample.py
similarity index 100%
rename from cython/gtsam/examples/GPSFactorExample.py
rename to python/gtsam/examples/GPSFactorExample.py
diff --git a/cython/gtsam/examples/ImuFactorExample.py b/python/gtsam/examples/ImuFactorExample.py
similarity index 100%
rename from cython/gtsam/examples/ImuFactorExample.py
rename to python/gtsam/examples/ImuFactorExample.py
diff --git a/cython/gtsam/examples/ImuFactorExample2.py b/python/gtsam/examples/ImuFactorExample2.py
similarity index 100%
rename from cython/gtsam/examples/ImuFactorExample2.py
rename to python/gtsam/examples/ImuFactorExample2.py
diff --git a/cython/gtsam/examples/OdometryExample.py b/python/gtsam/examples/OdometryExample.py
similarity index 100%
rename from cython/gtsam/examples/OdometryExample.py
rename to python/gtsam/examples/OdometryExample.py
diff --git a/cython/gtsam/examples/PlanarManipulatorExample.py b/python/gtsam/examples/PlanarManipulatorExample.py
similarity index 100%
rename from cython/gtsam/examples/PlanarManipulatorExample.py
rename to python/gtsam/examples/PlanarManipulatorExample.py
diff --git a/cython/gtsam/examples/PlanarSLAMExample.py b/python/gtsam/examples/PlanarSLAMExample.py
similarity index 100%
rename from cython/gtsam/examples/PlanarSLAMExample.py
rename to python/gtsam/examples/PlanarSLAMExample.py
diff --git a/cython/gtsam/examples/Pose2SLAMExample.py b/python/gtsam/examples/Pose2SLAMExample.py
similarity index 100%
rename from cython/gtsam/examples/Pose2SLAMExample.py
rename to python/gtsam/examples/Pose2SLAMExample.py
diff --git a/cython/gtsam/examples/Pose2SLAMExample_g2o.py b/python/gtsam/examples/Pose2SLAMExample_g2o.py
similarity index 100%
rename from cython/gtsam/examples/Pose2SLAMExample_g2o.py
rename to python/gtsam/examples/Pose2SLAMExample_g2o.py
diff --git a/cython/gtsam/examples/Pose3SLAMExample_g2o.py b/python/gtsam/examples/Pose3SLAMExample_g2o.py
similarity index 100%
rename from cython/gtsam/examples/Pose3SLAMExample_g2o.py
rename to python/gtsam/examples/Pose3SLAMExample_g2o.py
diff --git a/cython/gtsam/examples/Pose3SLAMExample_initializePose3Chordal.py b/python/gtsam/examples/Pose3SLAMExample_initializePose3Chordal.py
similarity index 100%
rename from cython/gtsam/examples/Pose3SLAMExample_initializePose3Chordal.py
rename to python/gtsam/examples/Pose3SLAMExample_initializePose3Chordal.py
diff --git a/cython/gtsam/examples/PreintegrationExample.py b/python/gtsam/examples/PreintegrationExample.py
similarity index 100%
rename from cython/gtsam/examples/PreintegrationExample.py
rename to python/gtsam/examples/PreintegrationExample.py
diff --git a/cython/gtsam/examples/README.md b/python/gtsam/examples/README.md
similarity index 100%
rename from cython/gtsam/examples/README.md
rename to python/gtsam/examples/README.md
diff --git a/cython/gtsam/examples/SFMExample.py b/python/gtsam/examples/SFMExample.py
similarity index 100%
rename from cython/gtsam/examples/SFMExample.py
rename to python/gtsam/examples/SFMExample.py
diff --git a/cython/gtsam/examples/SFMdata.py b/python/gtsam/examples/SFMdata.py
similarity index 100%
rename from cython/gtsam/examples/SFMdata.py
rename to python/gtsam/examples/SFMdata.py
diff --git a/cython/gtsam/examples/SimpleRotation.py b/python/gtsam/examples/SimpleRotation.py
similarity index 100%
rename from cython/gtsam/examples/SimpleRotation.py
rename to python/gtsam/examples/SimpleRotation.py
diff --git a/cython/gtsam/examples/VisualISAM2Example.py b/python/gtsam/examples/VisualISAM2Example.py
similarity index 100%
rename from cython/gtsam/examples/VisualISAM2Example.py
rename to python/gtsam/examples/VisualISAM2Example.py
diff --git a/cython/gtsam/examples/VisualISAMExample.py b/python/gtsam/examples/VisualISAMExample.py
similarity index 100%
rename from cython/gtsam/examples/VisualISAMExample.py
rename to python/gtsam/examples/VisualISAMExample.py
diff --git a/cython/gtsam/examples/__init__.py b/python/gtsam/examples/__init__.py
similarity index 100%
rename from cython/gtsam/examples/__init__.py
rename to python/gtsam/examples/__init__.py
diff --git a/cython/gtsam/tests/__init__.py b/python/gtsam/tests/__init__.py
similarity index 100%
rename from cython/gtsam/tests/__init__.py
rename to python/gtsam/tests/__init__.py
diff --git a/cython/gtsam/tests/testScenarioRunner.py b/python/gtsam/tests/testScenarioRunner.py
similarity index 100%
rename from cython/gtsam/tests/testScenarioRunner.py
rename to python/gtsam/tests/testScenarioRunner.py
diff --git a/cython/gtsam/tests/test_Cal3Unified.py b/python/gtsam/tests/test_Cal3Unified.py
similarity index 100%
rename from cython/gtsam/tests/test_Cal3Unified.py
rename to python/gtsam/tests/test_Cal3Unified.py
diff --git a/cython/gtsam/tests/test_FrobeniusFactor.py b/python/gtsam/tests/test_FrobeniusFactor.py
similarity index 100%
rename from cython/gtsam/tests/test_FrobeniusFactor.py
rename to python/gtsam/tests/test_FrobeniusFactor.py
diff --git a/cython/gtsam/tests/test_GaussianFactorGraph.py b/python/gtsam/tests/test_GaussianFactorGraph.py
similarity index 100%
rename from cython/gtsam/tests/test_GaussianFactorGraph.py
rename to python/gtsam/tests/test_GaussianFactorGraph.py
diff --git a/cython/gtsam/tests/test_JacobianFactor.py b/python/gtsam/tests/test_JacobianFactor.py
similarity index 100%
rename from cython/gtsam/tests/test_JacobianFactor.py
rename to python/gtsam/tests/test_JacobianFactor.py
diff --git a/cython/gtsam/tests/test_KalmanFilter.py b/python/gtsam/tests/test_KalmanFilter.py
similarity index 100%
rename from cython/gtsam/tests/test_KalmanFilter.py
rename to python/gtsam/tests/test_KalmanFilter.py
diff --git a/cython/gtsam/tests/test_KarcherMeanFactor.py b/python/gtsam/tests/test_KarcherMeanFactor.py
similarity index 100%
rename from cython/gtsam/tests/test_KarcherMeanFactor.py
rename to python/gtsam/tests/test_KarcherMeanFactor.py
diff --git a/cython/gtsam/tests/test_LocalizationExample.py b/python/gtsam/tests/test_LocalizationExample.py
similarity index 100%
rename from cython/gtsam/tests/test_LocalizationExample.py
rename to python/gtsam/tests/test_LocalizationExample.py
diff --git a/cython/gtsam/tests/test_NonlinearOptimizer.py b/python/gtsam/tests/test_NonlinearOptimizer.py
similarity index 100%
rename from cython/gtsam/tests/test_NonlinearOptimizer.py
rename to python/gtsam/tests/test_NonlinearOptimizer.py
diff --git a/cython/gtsam/tests/test_OdometryExample.py b/python/gtsam/tests/test_OdometryExample.py
similarity index 100%
rename from cython/gtsam/tests/test_OdometryExample.py
rename to python/gtsam/tests/test_OdometryExample.py
diff --git a/cython/gtsam/tests/test_PlanarSLAMExample.py b/python/gtsam/tests/test_PlanarSLAMExample.py
similarity index 100%
rename from cython/gtsam/tests/test_PlanarSLAMExample.py
rename to python/gtsam/tests/test_PlanarSLAMExample.py
diff --git a/cython/gtsam/tests/test_Pose2.py b/python/gtsam/tests/test_Pose2.py
similarity index 100%
rename from cython/gtsam/tests/test_Pose2.py
rename to python/gtsam/tests/test_Pose2.py
diff --git a/cython/gtsam/tests/test_Pose2SLAMExample.py b/python/gtsam/tests/test_Pose2SLAMExample.py
similarity index 100%
rename from cython/gtsam/tests/test_Pose2SLAMExample.py
rename to python/gtsam/tests/test_Pose2SLAMExample.py
diff --git a/cython/gtsam/tests/test_Pose3.py b/python/gtsam/tests/test_Pose3.py
similarity index 100%
rename from cython/gtsam/tests/test_Pose3.py
rename to python/gtsam/tests/test_Pose3.py
diff --git a/cython/gtsam/tests/test_Pose3SLAMExample.py b/python/gtsam/tests/test_Pose3SLAMExample.py
similarity index 100%
rename from cython/gtsam/tests/test_Pose3SLAMExample.py
rename to python/gtsam/tests/test_Pose3SLAMExample.py
diff --git a/cython/gtsam/tests/test_PriorFactor.py b/python/gtsam/tests/test_PriorFactor.py
similarity index 100%
rename from cython/gtsam/tests/test_PriorFactor.py
rename to python/gtsam/tests/test_PriorFactor.py
diff --git a/cython/gtsam/tests/test_SFMExample.py b/python/gtsam/tests/test_SFMExample.py
similarity index 100%
rename from cython/gtsam/tests/test_SFMExample.py
rename to python/gtsam/tests/test_SFMExample.py
diff --git a/cython/gtsam/tests/test_SO4.py b/python/gtsam/tests/test_SO4.py
similarity index 100%
rename from cython/gtsam/tests/test_SO4.py
rename to python/gtsam/tests/test_SO4.py
diff --git a/cython/gtsam/tests/test_SOn.py b/python/gtsam/tests/test_SOn.py
similarity index 100%
rename from cython/gtsam/tests/test_SOn.py
rename to python/gtsam/tests/test_SOn.py
diff --git a/cython/gtsam/tests/test_Scenario.py b/python/gtsam/tests/test_Scenario.py
similarity index 100%
rename from cython/gtsam/tests/test_Scenario.py
rename to python/gtsam/tests/test_Scenario.py
diff --git a/cython/gtsam/tests/test_SimpleCamera.py b/python/gtsam/tests/test_SimpleCamera.py
similarity index 100%
rename from cython/gtsam/tests/test_SimpleCamera.py
rename to python/gtsam/tests/test_SimpleCamera.py
diff --git a/cython/gtsam/tests/test_StereoVOExample.py b/python/gtsam/tests/test_StereoVOExample.py
similarity index 100%
rename from cython/gtsam/tests/test_StereoVOExample.py
rename to python/gtsam/tests/test_StereoVOExample.py
diff --git a/cython/gtsam/tests/test_Values.py b/python/gtsam/tests/test_Values.py
similarity index 100%
rename from cython/gtsam/tests/test_Values.py
rename to python/gtsam/tests/test_Values.py
diff --git a/cython/gtsam/tests/test_VisualISAMExample.py b/python/gtsam/tests/test_VisualISAMExample.py
similarity index 100%
rename from cython/gtsam/tests/test_VisualISAMExample.py
rename to python/gtsam/tests/test_VisualISAMExample.py
diff --git a/cython/gtsam/tests/test_dataset.py b/python/gtsam/tests/test_dataset.py
similarity index 100%
rename from cython/gtsam/tests/test_dataset.py
rename to python/gtsam/tests/test_dataset.py
diff --git a/cython/gtsam/tests/test_dsf_map.py b/python/gtsam/tests/test_dsf_map.py
similarity index 100%
rename from cython/gtsam/tests/test_dsf_map.py
rename to python/gtsam/tests/test_dsf_map.py
diff --git a/cython/gtsam/tests/test_initialize_pose3.py b/python/gtsam/tests/test_initialize_pose3.py
similarity index 100%
rename from cython/gtsam/tests/test_initialize_pose3.py
rename to python/gtsam/tests/test_initialize_pose3.py
diff --git a/cython/gtsam/tests/test_logging_optimizer.py b/python/gtsam/tests/test_logging_optimizer.py
similarity index 100%
rename from cython/gtsam/tests/test_logging_optimizer.py
rename to python/gtsam/tests/test_logging_optimizer.py
diff --git a/cython/gtsam/utils/__init__.py b/python/gtsam/utils/__init__.py
similarity index 100%
rename from cython/gtsam/utils/__init__.py
rename to python/gtsam/utils/__init__.py
diff --git a/cython/gtsam/utils/circlePose3.py b/python/gtsam/utils/circlePose3.py
similarity index 100%
rename from cython/gtsam/utils/circlePose3.py
rename to python/gtsam/utils/circlePose3.py
diff --git a/cython/gtsam/utils/logging_optimizer.py b/python/gtsam/utils/logging_optimizer.py
similarity index 100%
rename from cython/gtsam/utils/logging_optimizer.py
rename to python/gtsam/utils/logging_optimizer.py
diff --git a/cython/gtsam/utils/plot.py b/python/gtsam/utils/plot.py
similarity index 100%
rename from cython/gtsam/utils/plot.py
rename to python/gtsam/utils/plot.py
diff --git a/cython/gtsam/utils/test_case.py b/python/gtsam/utils/test_case.py
similarity index 100%
rename from cython/gtsam/utils/test_case.py
rename to python/gtsam/utils/test_case.py
diff --git a/cython/gtsam/utils/visual_data_generator.py b/python/gtsam/utils/visual_data_generator.py
similarity index 100%
rename from cython/gtsam/utils/visual_data_generator.py
rename to python/gtsam/utils/visual_data_generator.py
diff --git a/cython/gtsam/utils/visual_isam.py b/python/gtsam/utils/visual_isam.py
similarity index 100%
rename from cython/gtsam/utils/visual_isam.py
rename to python/gtsam/utils/visual_isam.py
diff --git a/cython/gtsam_eigency/CMakeLists.txt b/python/gtsam_eigency/CMakeLists.txt
similarity index 100%
rename from cython/gtsam_eigency/CMakeLists.txt
rename to python/gtsam_eigency/CMakeLists.txt
diff --git a/cython/gtsam_eigency/LICENSE.txt b/python/gtsam_eigency/LICENSE.txt
similarity index 100%
rename from cython/gtsam_eigency/LICENSE.txt
rename to python/gtsam_eigency/LICENSE.txt
diff --git a/cython/gtsam_eigency/__init__.py.in b/python/gtsam_eigency/__init__.py.in
similarity index 100%
rename from cython/gtsam_eigency/__init__.py.in
rename to python/gtsam_eigency/__init__.py.in
diff --git a/cython/gtsam_eigency/conversions.pxd b/python/gtsam_eigency/conversions.pxd
similarity index 100%
rename from cython/gtsam_eigency/conversions.pxd
rename to python/gtsam_eigency/conversions.pxd
diff --git a/cython/gtsam_eigency/conversions.pyx b/python/gtsam_eigency/conversions.pyx
similarity index 100%
rename from cython/gtsam_eigency/conversions.pyx
rename to python/gtsam_eigency/conversions.pyx
diff --git a/cython/gtsam_eigency/core.pxd b/python/gtsam_eigency/core.pxd
similarity index 100%
rename from cython/gtsam_eigency/core.pxd
rename to python/gtsam_eigency/core.pxd
diff --git a/cython/gtsam_eigency/core.pyx b/python/gtsam_eigency/core.pyx
similarity index 100%
rename from cython/gtsam_eigency/core.pyx
rename to python/gtsam_eigency/core.pyx
diff --git a/cython/gtsam_eigency/eigency_cpp.h b/python/gtsam_eigency/eigency_cpp.h
similarity index 100%
rename from cython/gtsam_eigency/eigency_cpp.h
rename to python/gtsam_eigency/eigency_cpp.h
diff --git a/cython/gtsam_unstable/__init__.py b/python/gtsam_unstable/__init__.py
similarity index 100%
rename from cython/gtsam_unstable/__init__.py
rename to python/gtsam_unstable/__init__.py
diff --git a/cython/gtsam_unstable/examples/FixedLagSmootherExample.py b/python/gtsam_unstable/examples/FixedLagSmootherExample.py
similarity index 100%
rename from cython/gtsam_unstable/examples/FixedLagSmootherExample.py
rename to python/gtsam_unstable/examples/FixedLagSmootherExample.py
diff --git a/cython/gtsam_unstable/examples/TimeOfArrivalExample.py b/python/gtsam_unstable/examples/TimeOfArrivalExample.py
similarity index 100%
rename from cython/gtsam_unstable/examples/TimeOfArrivalExample.py
rename to python/gtsam_unstable/examples/TimeOfArrivalExample.py
diff --git a/cython/gtsam_unstable/examples/__init__.py b/python/gtsam_unstable/examples/__init__.py
similarity index 100%
rename from cython/gtsam_unstable/examples/__init__.py
rename to python/gtsam_unstable/examples/__init__.py
diff --git a/cython/gtsam_unstable/tests/__init__.py b/python/gtsam_unstable/tests/__init__.py
similarity index 100%
rename from cython/gtsam_unstable/tests/__init__.py
rename to python/gtsam_unstable/tests/__init__.py
diff --git a/cython/gtsam_unstable/tests/test_FixedLagSmootherExample.py b/python/gtsam_unstable/tests/test_FixedLagSmootherExample.py
similarity index 100%
rename from cython/gtsam_unstable/tests/test_FixedLagSmootherExample.py
rename to python/gtsam_unstable/tests/test_FixedLagSmootherExample.py
diff --git a/cython/requirements.txt b/python/requirements.txt
similarity index 100%
rename from cython/requirements.txt
rename to python/requirements.txt
diff --git a/cython/setup.py.in b/python/setup.py.in
similarity index 100%
rename from cython/setup.py.in
rename to python/setup.py.in