From 3d4a8e16a26907df941af55ad9da0c3173be6bf2 Mon Sep 17 00:00:00 2001 From: Fan Jiang Date: Fri, 31 Jul 2020 11:49:31 -0400 Subject: [PATCH] Moved python files --- python/{gtsam_py/python => gtsam}/__init__.py | 0 .../{gtsam_py/python => gtsam}/examples/DogLegOptimizerExample.py | 0 python/{gtsam_py/python => gtsam}/examples/GPSFactorExample.py | 0 python/{gtsam_py/python => gtsam}/examples/ImuFactorExample.py | 0 .../{gtsam_py/python => gtsam}/examples/ImuFactorISAM2Example.py | 0 python/{gtsam_py/python => gtsam}/examples/OdometryExample.py | 0 .../python => gtsam}/examples/PlanarManipulatorExample.py | 0 python/{gtsam_py/python => gtsam}/examples/PlanarSLAMExample.py | 0 python/{gtsam_py/python => gtsam}/examples/Pose2SLAMExample.py | 0 .../{gtsam_py/python => gtsam}/examples/Pose2SLAMExample_g2o.py | 0 .../{gtsam_py/python => gtsam}/examples/Pose3SLAMExample_g2o.py | 0 .../examples/Pose3SLAMExample_initializePose3Chordal.py | 0 .../{gtsam_py/python => gtsam}/examples/PreintegrationExample.py | 0 python/{gtsam_py/python => gtsam}/examples/README.md | 0 python/{gtsam_py/python => gtsam}/examples/SFMExample.py | 0 python/{gtsam_py/python => gtsam}/examples/SFMdata.py | 0 python/{gtsam_py/python => gtsam}/examples/SimpleRotation.py | 0 python/{gtsam_py/python => gtsam}/examples/VisualISAM2Example.py | 0 python/{gtsam_py/python => gtsam}/examples/VisualISAMExample.py | 0 python/{gtsam_py/python => gtsam}/examples/__init__.py | 0 python/{gtsam_py/python => gtsam}/tests/testScenarioRunner.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Cal3Unified.py | 0 python/{gtsam_py/python => gtsam}/tests/test_FrobeniusFactor.py | 0 .../{gtsam_py/python => gtsam}/tests/test_GaussianFactorGraph.py | 0 python/{gtsam_py/python => gtsam}/tests/test_JacobianFactor.py | 0 python/{gtsam_py/python => gtsam}/tests/test_KalmanFilter.py | 0 python/{gtsam_py/python => gtsam}/tests/test_KarcherMeanFactor.py | 0 .../{gtsam_py/python => gtsam}/tests/test_LocalizationExample.py | 0 .../{gtsam_py/python => gtsam}/tests/test_NonlinearOptimizer.py | 0 python/{gtsam_py/python => gtsam}/tests/test_OdometryExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_PlanarSLAMExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Pose2.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Pose2SLAMExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Pose3.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Pose3SLAMExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_PriorFactor.py | 0 python/{gtsam_py/python => gtsam}/tests/test_SFMExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_SO4.py | 0 python/{gtsam_py/python => gtsam}/tests/test_SOn.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Scenario.py | 0 python/{gtsam_py/python => gtsam}/tests/test_SimpleCamera.py | 0 python/{gtsam_py/python => gtsam}/tests/test_StereoVOExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Triangulation.py | 0 python/{gtsam_py/python => gtsam}/tests/test_Values.py | 0 python/{gtsam_py/python => gtsam}/tests/test_VisualISAMExample.py | 0 python/{gtsam_py/python => gtsam}/tests/test_dataset.py | 0 python/{gtsam_py/python => gtsam}/tests/test_dsf_map.py | 0 python/{gtsam_py/python => gtsam}/tests/test_initialize_pose3.py | 0 python/{gtsam_py/python => gtsam}/tests/test_logging_optimizer.py | 0 python/{gtsam_py/python => gtsam}/utils/__init__.py | 0 python/{gtsam_py/python => gtsam}/utils/circlePose3.py | 0 python/{gtsam_py/python => gtsam}/utils/logging_optimizer.py | 0 python/{gtsam_py/python => gtsam}/utils/plot.py | 0 python/{gtsam_py/python => gtsam}/utils/test_case.py | 0 python/{gtsam_py/python => gtsam}/utils/visual_data_generator.py | 0 python/{gtsam_py/python => gtsam}/utils/visual_isam.py | 0 python/{gtsam_unstable_py/python => gtsam_unstable}/__init__.py | 0 .../python => gtsam_unstable}/examples/FixedLagSmootherExample.py | 0 .../python => gtsam_unstable}/examples/TimeOfArrivalExample.py | 0 .../python => gtsam_unstable}/examples/__init__.py | 0 .../python => gtsam_unstable}/tests/__init__.py | 0 .../tests/test_FixedLagSmootherExample.py | 0 62 files changed, 0 insertions(+), 0 deletions(-) rename python/{gtsam_py/python => gtsam}/__init__.py (100%) rename python/{gtsam_py/python => gtsam}/examples/DogLegOptimizerExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/GPSFactorExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/ImuFactorExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/ImuFactorISAM2Example.py (100%) rename python/{gtsam_py/python => gtsam}/examples/OdometryExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/PlanarManipulatorExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/PlanarSLAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/Pose2SLAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/Pose2SLAMExample_g2o.py (100%) rename python/{gtsam_py/python => gtsam}/examples/Pose3SLAMExample_g2o.py (100%) rename python/{gtsam_py/python => gtsam}/examples/Pose3SLAMExample_initializePose3Chordal.py (100%) rename python/{gtsam_py/python => gtsam}/examples/PreintegrationExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/README.md (100%) rename python/{gtsam_py/python => gtsam}/examples/SFMExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/SFMdata.py (100%) rename python/{gtsam_py/python => gtsam}/examples/SimpleRotation.py (100%) rename python/{gtsam_py/python => gtsam}/examples/VisualISAM2Example.py (100%) rename python/{gtsam_py/python => gtsam}/examples/VisualISAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/examples/__init__.py (100%) rename python/{gtsam_py/python => gtsam}/tests/testScenarioRunner.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Cal3Unified.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_FrobeniusFactor.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_GaussianFactorGraph.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_JacobianFactor.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_KalmanFilter.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_KarcherMeanFactor.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_LocalizationExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_NonlinearOptimizer.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_OdometryExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_PlanarSLAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Pose2.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Pose2SLAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Pose3.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Pose3SLAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_PriorFactor.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_SFMExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_SO4.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_SOn.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Scenario.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_SimpleCamera.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_StereoVOExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Triangulation.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_Values.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_VisualISAMExample.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_dataset.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_dsf_map.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_initialize_pose3.py (100%) rename python/{gtsam_py/python => gtsam}/tests/test_logging_optimizer.py (100%) rename python/{gtsam_py/python => gtsam}/utils/__init__.py (100%) rename python/{gtsam_py/python => gtsam}/utils/circlePose3.py (100%) rename python/{gtsam_py/python => gtsam}/utils/logging_optimizer.py (100%) rename python/{gtsam_py/python => gtsam}/utils/plot.py (100%) rename python/{gtsam_py/python => gtsam}/utils/test_case.py (100%) rename python/{gtsam_py/python => gtsam}/utils/visual_data_generator.py (100%) rename python/{gtsam_py/python => gtsam}/utils/visual_isam.py (100%) rename python/{gtsam_unstable_py/python => gtsam_unstable}/__init__.py (100%) rename python/{gtsam_unstable_py/python => gtsam_unstable}/examples/FixedLagSmootherExample.py (100%) rename python/{gtsam_unstable_py/python => gtsam_unstable}/examples/TimeOfArrivalExample.py (100%) rename python/{gtsam_unstable_py/python => gtsam_unstable}/examples/__init__.py (100%) rename python/{gtsam_unstable_py/python => gtsam_unstable}/tests/__init__.py (100%) rename python/{gtsam_unstable_py/python => gtsam_unstable}/tests/test_FixedLagSmootherExample.py (100%) diff --git a/python/gtsam_py/python/__init__.py b/python/gtsam/__init__.py similarity index 100% rename from python/gtsam_py/python/__init__.py rename to python/gtsam/__init__.py diff --git a/python/gtsam_py/python/examples/DogLegOptimizerExample.py b/python/gtsam/examples/DogLegOptimizerExample.py similarity index 100% rename from python/gtsam_py/python/examples/DogLegOptimizerExample.py rename to python/gtsam/examples/DogLegOptimizerExample.py diff --git a/python/gtsam_py/python/examples/GPSFactorExample.py b/python/gtsam/examples/GPSFactorExample.py similarity index 100% rename from python/gtsam_py/python/examples/GPSFactorExample.py rename to python/gtsam/examples/GPSFactorExample.py diff --git a/python/gtsam_py/python/examples/ImuFactorExample.py b/python/gtsam/examples/ImuFactorExample.py similarity index 100% rename from python/gtsam_py/python/examples/ImuFactorExample.py rename to python/gtsam/examples/ImuFactorExample.py diff --git a/python/gtsam_py/python/examples/ImuFactorISAM2Example.py b/python/gtsam/examples/ImuFactorISAM2Example.py similarity index 100% rename from python/gtsam_py/python/examples/ImuFactorISAM2Example.py rename to python/gtsam/examples/ImuFactorISAM2Example.py diff --git a/python/gtsam_py/python/examples/OdometryExample.py b/python/gtsam/examples/OdometryExample.py similarity index 100% rename from python/gtsam_py/python/examples/OdometryExample.py rename to python/gtsam/examples/OdometryExample.py diff --git a/python/gtsam_py/python/examples/PlanarManipulatorExample.py b/python/gtsam/examples/PlanarManipulatorExample.py similarity index 100% rename from python/gtsam_py/python/examples/PlanarManipulatorExample.py rename to python/gtsam/examples/PlanarManipulatorExample.py diff --git a/python/gtsam_py/python/examples/PlanarSLAMExample.py b/python/gtsam/examples/PlanarSLAMExample.py similarity index 100% rename from python/gtsam_py/python/examples/PlanarSLAMExample.py rename to python/gtsam/examples/PlanarSLAMExample.py diff --git a/python/gtsam_py/python/examples/Pose2SLAMExample.py b/python/gtsam/examples/Pose2SLAMExample.py similarity index 100% rename from python/gtsam_py/python/examples/Pose2SLAMExample.py rename to python/gtsam/examples/Pose2SLAMExample.py diff --git a/python/gtsam_py/python/examples/Pose2SLAMExample_g2o.py b/python/gtsam/examples/Pose2SLAMExample_g2o.py similarity index 100% rename from python/gtsam_py/python/examples/Pose2SLAMExample_g2o.py rename to python/gtsam/examples/Pose2SLAMExample_g2o.py diff --git a/python/gtsam_py/python/examples/Pose3SLAMExample_g2o.py b/python/gtsam/examples/Pose3SLAMExample_g2o.py similarity index 100% rename from python/gtsam_py/python/examples/Pose3SLAMExample_g2o.py rename to python/gtsam/examples/Pose3SLAMExample_g2o.py diff --git a/python/gtsam_py/python/examples/Pose3SLAMExample_initializePose3Chordal.py b/python/gtsam/examples/Pose3SLAMExample_initializePose3Chordal.py similarity index 100% rename from python/gtsam_py/python/examples/Pose3SLAMExample_initializePose3Chordal.py rename to python/gtsam/examples/Pose3SLAMExample_initializePose3Chordal.py diff --git a/python/gtsam_py/python/examples/PreintegrationExample.py b/python/gtsam/examples/PreintegrationExample.py similarity index 100% rename from python/gtsam_py/python/examples/PreintegrationExample.py rename to python/gtsam/examples/PreintegrationExample.py diff --git a/python/gtsam_py/python/examples/README.md b/python/gtsam/examples/README.md similarity index 100% rename from python/gtsam_py/python/examples/README.md rename to python/gtsam/examples/README.md diff --git a/python/gtsam_py/python/examples/SFMExample.py b/python/gtsam/examples/SFMExample.py similarity index 100% rename from python/gtsam_py/python/examples/SFMExample.py rename to python/gtsam/examples/SFMExample.py diff --git a/python/gtsam_py/python/examples/SFMdata.py b/python/gtsam/examples/SFMdata.py similarity index 100% rename from python/gtsam_py/python/examples/SFMdata.py rename to python/gtsam/examples/SFMdata.py diff --git a/python/gtsam_py/python/examples/SimpleRotation.py b/python/gtsam/examples/SimpleRotation.py similarity index 100% rename from python/gtsam_py/python/examples/SimpleRotation.py rename to python/gtsam/examples/SimpleRotation.py diff --git a/python/gtsam_py/python/examples/VisualISAM2Example.py b/python/gtsam/examples/VisualISAM2Example.py similarity index 100% rename from python/gtsam_py/python/examples/VisualISAM2Example.py rename to python/gtsam/examples/VisualISAM2Example.py diff --git a/python/gtsam_py/python/examples/VisualISAMExample.py b/python/gtsam/examples/VisualISAMExample.py similarity index 100% rename from python/gtsam_py/python/examples/VisualISAMExample.py rename to python/gtsam/examples/VisualISAMExample.py diff --git a/python/gtsam_py/python/examples/__init__.py b/python/gtsam/examples/__init__.py similarity index 100% rename from python/gtsam_py/python/examples/__init__.py rename to python/gtsam/examples/__init__.py diff --git a/python/gtsam_py/python/tests/testScenarioRunner.py b/python/gtsam/tests/testScenarioRunner.py similarity index 100% rename from python/gtsam_py/python/tests/testScenarioRunner.py rename to python/gtsam/tests/testScenarioRunner.py diff --git a/python/gtsam_py/python/tests/test_Cal3Unified.py b/python/gtsam/tests/test_Cal3Unified.py similarity index 100% rename from python/gtsam_py/python/tests/test_Cal3Unified.py rename to python/gtsam/tests/test_Cal3Unified.py diff --git a/python/gtsam_py/python/tests/test_FrobeniusFactor.py b/python/gtsam/tests/test_FrobeniusFactor.py similarity index 100% rename from python/gtsam_py/python/tests/test_FrobeniusFactor.py rename to python/gtsam/tests/test_FrobeniusFactor.py diff --git a/python/gtsam_py/python/tests/test_GaussianFactorGraph.py b/python/gtsam/tests/test_GaussianFactorGraph.py similarity index 100% rename from python/gtsam_py/python/tests/test_GaussianFactorGraph.py rename to python/gtsam/tests/test_GaussianFactorGraph.py diff --git a/python/gtsam_py/python/tests/test_JacobianFactor.py b/python/gtsam/tests/test_JacobianFactor.py similarity index 100% rename from python/gtsam_py/python/tests/test_JacobianFactor.py rename to python/gtsam/tests/test_JacobianFactor.py diff --git a/python/gtsam_py/python/tests/test_KalmanFilter.py b/python/gtsam/tests/test_KalmanFilter.py similarity index 100% rename from python/gtsam_py/python/tests/test_KalmanFilter.py rename to python/gtsam/tests/test_KalmanFilter.py diff --git a/python/gtsam_py/python/tests/test_KarcherMeanFactor.py b/python/gtsam/tests/test_KarcherMeanFactor.py similarity index 100% rename from python/gtsam_py/python/tests/test_KarcherMeanFactor.py rename to python/gtsam/tests/test_KarcherMeanFactor.py diff --git a/python/gtsam_py/python/tests/test_LocalizationExample.py b/python/gtsam/tests/test_LocalizationExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_LocalizationExample.py rename to python/gtsam/tests/test_LocalizationExample.py diff --git a/python/gtsam_py/python/tests/test_NonlinearOptimizer.py b/python/gtsam/tests/test_NonlinearOptimizer.py similarity index 100% rename from python/gtsam_py/python/tests/test_NonlinearOptimizer.py rename to python/gtsam/tests/test_NonlinearOptimizer.py diff --git a/python/gtsam_py/python/tests/test_OdometryExample.py b/python/gtsam/tests/test_OdometryExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_OdometryExample.py rename to python/gtsam/tests/test_OdometryExample.py diff --git a/python/gtsam_py/python/tests/test_PlanarSLAMExample.py b/python/gtsam/tests/test_PlanarSLAMExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_PlanarSLAMExample.py rename to python/gtsam/tests/test_PlanarSLAMExample.py diff --git a/python/gtsam_py/python/tests/test_Pose2.py b/python/gtsam/tests/test_Pose2.py similarity index 100% rename from python/gtsam_py/python/tests/test_Pose2.py rename to python/gtsam/tests/test_Pose2.py diff --git a/python/gtsam_py/python/tests/test_Pose2SLAMExample.py b/python/gtsam/tests/test_Pose2SLAMExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_Pose2SLAMExample.py rename to python/gtsam/tests/test_Pose2SLAMExample.py diff --git a/python/gtsam_py/python/tests/test_Pose3.py b/python/gtsam/tests/test_Pose3.py similarity index 100% rename from python/gtsam_py/python/tests/test_Pose3.py rename to python/gtsam/tests/test_Pose3.py diff --git a/python/gtsam_py/python/tests/test_Pose3SLAMExample.py b/python/gtsam/tests/test_Pose3SLAMExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_Pose3SLAMExample.py rename to python/gtsam/tests/test_Pose3SLAMExample.py diff --git a/python/gtsam_py/python/tests/test_PriorFactor.py b/python/gtsam/tests/test_PriorFactor.py similarity index 100% rename from python/gtsam_py/python/tests/test_PriorFactor.py rename to python/gtsam/tests/test_PriorFactor.py diff --git a/python/gtsam_py/python/tests/test_SFMExample.py b/python/gtsam/tests/test_SFMExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_SFMExample.py rename to python/gtsam/tests/test_SFMExample.py diff --git a/python/gtsam_py/python/tests/test_SO4.py b/python/gtsam/tests/test_SO4.py similarity index 100% rename from python/gtsam_py/python/tests/test_SO4.py rename to python/gtsam/tests/test_SO4.py diff --git a/python/gtsam_py/python/tests/test_SOn.py b/python/gtsam/tests/test_SOn.py similarity index 100% rename from python/gtsam_py/python/tests/test_SOn.py rename to python/gtsam/tests/test_SOn.py diff --git a/python/gtsam_py/python/tests/test_Scenario.py b/python/gtsam/tests/test_Scenario.py similarity index 100% rename from python/gtsam_py/python/tests/test_Scenario.py rename to python/gtsam/tests/test_Scenario.py diff --git a/python/gtsam_py/python/tests/test_SimpleCamera.py b/python/gtsam/tests/test_SimpleCamera.py similarity index 100% rename from python/gtsam_py/python/tests/test_SimpleCamera.py rename to python/gtsam/tests/test_SimpleCamera.py diff --git a/python/gtsam_py/python/tests/test_StereoVOExample.py b/python/gtsam/tests/test_StereoVOExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_StereoVOExample.py rename to python/gtsam/tests/test_StereoVOExample.py diff --git a/python/gtsam_py/python/tests/test_Triangulation.py b/python/gtsam/tests/test_Triangulation.py similarity index 100% rename from python/gtsam_py/python/tests/test_Triangulation.py rename to python/gtsam/tests/test_Triangulation.py diff --git a/python/gtsam_py/python/tests/test_Values.py b/python/gtsam/tests/test_Values.py similarity index 100% rename from python/gtsam_py/python/tests/test_Values.py rename to python/gtsam/tests/test_Values.py diff --git a/python/gtsam_py/python/tests/test_VisualISAMExample.py b/python/gtsam/tests/test_VisualISAMExample.py similarity index 100% rename from python/gtsam_py/python/tests/test_VisualISAMExample.py rename to python/gtsam/tests/test_VisualISAMExample.py diff --git a/python/gtsam_py/python/tests/test_dataset.py b/python/gtsam/tests/test_dataset.py similarity index 100% rename from python/gtsam_py/python/tests/test_dataset.py rename to python/gtsam/tests/test_dataset.py diff --git a/python/gtsam_py/python/tests/test_dsf_map.py b/python/gtsam/tests/test_dsf_map.py similarity index 100% rename from python/gtsam_py/python/tests/test_dsf_map.py rename to python/gtsam/tests/test_dsf_map.py diff --git a/python/gtsam_py/python/tests/test_initialize_pose3.py b/python/gtsam/tests/test_initialize_pose3.py similarity index 100% rename from python/gtsam_py/python/tests/test_initialize_pose3.py rename to python/gtsam/tests/test_initialize_pose3.py diff --git a/python/gtsam_py/python/tests/test_logging_optimizer.py b/python/gtsam/tests/test_logging_optimizer.py similarity index 100% rename from python/gtsam_py/python/tests/test_logging_optimizer.py rename to python/gtsam/tests/test_logging_optimizer.py diff --git a/python/gtsam_py/python/utils/__init__.py b/python/gtsam/utils/__init__.py similarity index 100% rename from python/gtsam_py/python/utils/__init__.py rename to python/gtsam/utils/__init__.py diff --git a/python/gtsam_py/python/utils/circlePose3.py b/python/gtsam/utils/circlePose3.py similarity index 100% rename from python/gtsam_py/python/utils/circlePose3.py rename to python/gtsam/utils/circlePose3.py diff --git a/python/gtsam_py/python/utils/logging_optimizer.py b/python/gtsam/utils/logging_optimizer.py similarity index 100% rename from python/gtsam_py/python/utils/logging_optimizer.py rename to python/gtsam/utils/logging_optimizer.py diff --git a/python/gtsam_py/python/utils/plot.py b/python/gtsam/utils/plot.py similarity index 100% rename from python/gtsam_py/python/utils/plot.py rename to python/gtsam/utils/plot.py diff --git a/python/gtsam_py/python/utils/test_case.py b/python/gtsam/utils/test_case.py similarity index 100% rename from python/gtsam_py/python/utils/test_case.py rename to python/gtsam/utils/test_case.py diff --git a/python/gtsam_py/python/utils/visual_data_generator.py b/python/gtsam/utils/visual_data_generator.py similarity index 100% rename from python/gtsam_py/python/utils/visual_data_generator.py rename to python/gtsam/utils/visual_data_generator.py diff --git a/python/gtsam_py/python/utils/visual_isam.py b/python/gtsam/utils/visual_isam.py similarity index 100% rename from python/gtsam_py/python/utils/visual_isam.py rename to python/gtsam/utils/visual_isam.py diff --git a/python/gtsam_unstable_py/python/__init__.py b/python/gtsam_unstable/__init__.py similarity index 100% rename from python/gtsam_unstable_py/python/__init__.py rename to python/gtsam_unstable/__init__.py diff --git a/python/gtsam_unstable_py/python/examples/FixedLagSmootherExample.py b/python/gtsam_unstable/examples/FixedLagSmootherExample.py similarity index 100% rename from python/gtsam_unstable_py/python/examples/FixedLagSmootherExample.py rename to python/gtsam_unstable/examples/FixedLagSmootherExample.py diff --git a/python/gtsam_unstable_py/python/examples/TimeOfArrivalExample.py b/python/gtsam_unstable/examples/TimeOfArrivalExample.py similarity index 100% rename from python/gtsam_unstable_py/python/examples/TimeOfArrivalExample.py rename to python/gtsam_unstable/examples/TimeOfArrivalExample.py diff --git a/python/gtsam_unstable_py/python/examples/__init__.py b/python/gtsam_unstable/examples/__init__.py similarity index 100% rename from python/gtsam_unstable_py/python/examples/__init__.py rename to python/gtsam_unstable/examples/__init__.py diff --git a/python/gtsam_unstable_py/python/tests/__init__.py b/python/gtsam_unstable/tests/__init__.py similarity index 100% rename from python/gtsam_unstable_py/python/tests/__init__.py rename to python/gtsam_unstable/tests/__init__.py diff --git a/python/gtsam_unstable_py/python/tests/test_FixedLagSmootherExample.py b/python/gtsam_unstable/tests/test_FixedLagSmootherExample.py similarity index 100% rename from python/gtsam_unstable_py/python/tests/test_FixedLagSmootherExample.py rename to python/gtsam_unstable/tests/test_FixedLagSmootherExample.py