From 4087c972c6c55914628dc360bdfcb9f6569820c9 Mon Sep 17 00:00:00 2001
From: Joaquim Casals <jcasals@iri.upc.edu>
Date: Fri, 3 May 2019 11:49:41 +0200
Subject: [PATCH] Fixed includes base -> core renaming

---
 include/laser/capture/capture_laser_2D.h      |  2 +-
 include/laser/factor/factor_point_2D.h        |  2 +-
 .../laser/factor/factor_point_to_line_2D.h    |  2 +-
 .../laser/feature/feature_match_polyline_2D.h |  4 ++--
 include/laser/feature/feature_polyline_2D.h   |  2 +-
 .../landmark/landmark_match_polyline_2D.h     |  4 ++--
 include/laser/landmark/landmark_polyline_2D.h |  2 +-
 include/laser/processor/polyline_2D_utils.h   |  4 ++--
 include/laser/processor/processor_polyline.h  |  6 ++---
 .../processor_tracker_feature_polyline_2D.h   |  2 +-
 include/laser/sensor/sensor_laser_2D.h        |  2 +-
 .../local_parametrization_polyline_extreme.h  |  2 +-
 ...serialization_local_parametrization_base.h |  2 +-
 ...zation_local_parametrization_homogeneous.h |  2 +-
 ...ization_local_parametrization_quaternion.h |  2 +-
 .../cereal/serialization_node_base.h          |  2 +-
 .../serialization_processor_odom2d_params.h   |  2 +-
 .../serialization_processor_odom3d_params.h   |  2 +-
 .../serialization_processor_params_base.h     |  2 +-
 .../serialization_sensor_intrinsic_base.h     |  2 +-
 .../serialization_sensor_odom2d_intrinsic.h   |  2 +-
 .../cereal/serialization_time_stamp.h         |  2 +-
 src/examples/solver/test_ccolamd.cpp          |  2 +-
 src/examples/solver/test_iQR_wolf2.cpp        |  8 +++----
 src/examples/test_2_lasers_offline.cpp        | 16 +++++++-------
 src/examples/test_analytic_odom_factor.cpp    |  4 ++--
 src/examples/test_autodiff.cpp                |  4 ++--
 src/examples/test_capture_laser_2D.cpp        |  2 +-
 src/examples/test_ceres_2_lasers.cpp          | 16 +++++++-------
 .../test_ceres_2_lasers_polylines.cpp         | 16 +++++++-------
 src/examples/test_diff_drive.cpp              | 10 ++++-----
 src/examples/test_eigen_quaternion.cpp        |  2 +-
 src/examples/test_factor_AHP.cpp              | 14 ++++++------
 src/examples/test_factor_imu.cpp              | 20 ++++++++---------
 src/examples/test_factor_odom_3D.cpp          |  2 +-
 src/examples/test_faramotics_simulation.cpp   |  8 +++----
 src/examples/test_image.cpp                   |  8 +++----
 src/examples/test_imuDock.cpp                 | 18 +++++++--------
 src/examples/test_imuDock_autoKFs.cpp         | 18 +++++++--------
 src/examples/test_imuPlateform_Offline.cpp    | 22 +++++++++----------
 src/examples/test_imu_constrained0.cpp        | 22 +++++++++----------
 src/examples/test_kf_callback.cpp             |  8 +++----
 src/examples/test_map_yaml.cpp                | 14 ++++++------
 src/examples/test_mpu.cpp                     | 14 ++++++------
 src/examples/test_processor_imu.cpp           | 14 ++++++------
 src/examples/test_processor_imu_jacobians.cpp | 12 +++++-----
 src/examples/test_processor_odom_3D.cpp       | 14 ++++++------
 .../test_processor_tracker_feature.cpp        | 12 +++++-----
 .../test_processor_tracker_landmark.cpp       | 12 +++++-----
 .../test_processor_tracker_landmark_image.cpp | 20 ++++++++---------
 src/examples/test_projection_points.cpp       |  2 +-
 src/examples/test_simple_AHP.cpp              | 18 +++++++--------
 src/examples/test_sort_keyframes.cpp          |  8 +++----
 src/examples/test_sparsification.cpp          |  8 +++----
 src/examples/test_state_quaternion.cpp        |  6 ++---
 src/examples/test_tracker_ORB.cpp             |  2 +-
 src/examples/test_wolf_autodiffwrapper.cpp    |  4 ++--
 src/examples/test_wolf_factories.cpp          | 18 +++++++--------
 src/examples/test_wolf_imported_graph.cpp     |  4 ++--
 src/examples/test_wolf_logging.cpp            |  4 ++--
 src/examples/test_wolf_prunning.cpp           |  6 ++---
 src/examples/test_wolf_root.cpp               |  2 +-
 src/examples/test_yaml.cpp                    |  4 ++--
 src/examples/test_yaml_conversions.cpp        |  2 +-
 src/landmark/landmark_polyline_2D.cpp         |  6 ++---
 src/processor/processor_polyline.cpp          |  2 +-
 .../processor_tracker_feature_polyline_2D.cpp |  2 +-
 src/sensor/sensor_GPS.cpp                     |  8 +++----
 src/sensor/sensor_GPS_fix.cpp                 |  8 +++----
 src/sensor/sensor_IMU.cpp                     |  8 +++----
 src/sensor/sensor_base.cpp                    | 10 ++++-----
 src/sensor/sensor_diff_drive.cpp              | 10 ++++-----
 src/sensor/sensor_laser_2D.cpp                |  4 ++--
 src/sensor/sensor_odom_2D.cpp                 |  8 +++----
 src/sensor/sensor_odom_3D.cpp                 |  8 +++----
 src/solver_suitesparse/solver_manager.cpp     |  2 +-
 ...local_parametrization_polyline_extreme.cpp |  4 ++--
 src/yaml/sensor_laser_2D_yaml.cpp             |  6 ++---
 ..._processor_tracker_feature_polyline_2D.cpp |  6 ++---
 79 files changed, 283 insertions(+), 283 deletions(-)

diff --git a/include/laser/capture/capture_laser_2D.h b/include/laser/capture/capture_laser_2D.h
index 28e5f766a..03faa523d 100644
--- a/include/laser/capture/capture_laser_2D.h
+++ b/include/laser/capture/capture_laser_2D.h
@@ -8,7 +8,7 @@ class SensorLaser2D;
 }
 
 //wolf includes
-#include "base/capture/capture_base.h"
+#include "core/capture/capture_base.h"
 #include "laser/sensor/sensor_laser_2D.h"
 
 //laserscanutils includes
diff --git a/include/laser/factor/factor_point_2D.h b/include/laser/factor/factor_point_2D.h
index a9428ca53..5d8525a4a 100644
--- a/include/laser/factor/factor_point_2D.h
+++ b/include/laser/factor/factor_point_2D.h
@@ -2,7 +2,7 @@
 #define FACTOR_POINT_2D_THETA_H_
 
 //Wolf includes
-#include "base/factor/factor_autodiff.h"
+#include "core/factor/factor_autodiff.h"
 #include "laser/feature/feature_polyline_2D.h"
 #include "laser/landmark/landmark_polyline_2D.h"
 
diff --git a/include/laser/factor/factor_point_to_line_2D.h b/include/laser/factor/factor_point_to_line_2D.h
index 097a3a3cf..561526c67 100644
--- a/include/laser/factor/factor_point_to_line_2D.h
+++ b/include/laser/factor/factor_point_to_line_2D.h
@@ -2,7 +2,7 @@
 #define FACTOR_POINT_TO_LINE_2D_H_
 
 //Wolf includes
-#include "base/factor/factor_autodiff.h"
+#include "core/factor/factor_autodiff.h"
 #include "laser/feature/feature_polyline_2D.h"
 #include "laser/landmark/landmark_polyline_2D.h"
 
diff --git a/include/laser/feature/feature_match_polyline_2D.h b/include/laser/feature/feature_match_polyline_2D.h
index d71d91588..cbf21ad89 100644
--- a/include/laser/feature/feature_match_polyline_2D.h
+++ b/include/laser/feature/feature_match_polyline_2D.h
@@ -2,8 +2,8 @@
 #define FEATURE_MATCH_POLYLINE_2D_H_
 
 // Wolf includes
-#include "base/common/wolf.h"
-#include "base/feature/feature_match.h"
+#include "core/common/wolf.h"
+#include "core/feature/feature_match.h"
 
 //wolf nampseace
 namespace wolf {
diff --git a/include/laser/feature/feature_polyline_2D.h b/include/laser/feature/feature_polyline_2D.h
index 071f46be5..4dff63dcd 100644
--- a/include/laser/feature/feature_polyline_2D.h
+++ b/include/laser/feature/feature_polyline_2D.h
@@ -8,7 +8,7 @@
 #ifndef FEATURE_POLYLINE_2D_H_
 #define FEATURE_POLYLINE_2D_H_
 
-#include "base/feature/feature_base.h"
+#include "core/feature/feature_base.h"
 
 namespace wolf
 {
diff --git a/include/laser/landmark/landmark_match_polyline_2D.h b/include/laser/landmark/landmark_match_polyline_2D.h
index 8ab4d52dd..4e846418e 100644
--- a/include/laser/landmark/landmark_match_polyline_2D.h
+++ b/include/laser/landmark/landmark_match_polyline_2D.h
@@ -2,8 +2,8 @@
 #define LANDMARK_MATCH_POLYLINE_2D_H_
 
 // Wolf includes
-#include "base/common/wolf.h"
-#include "base/landmark/landmark_match.h"
+#include "core/common/wolf.h"
+#include "core/landmark/landmark_match.h"
 
 //wolf nampseace
 namespace wolf {
diff --git a/include/laser/landmark/landmark_polyline_2D.h b/include/laser/landmark/landmark_polyline_2D.h
index 4c1e5084d..16dcdb9c5 100644
--- a/include/laser/landmark/landmark_polyline_2D.h
+++ b/include/laser/landmark/landmark_polyline_2D.h
@@ -9,7 +9,7 @@
 #define LANDMARK_POLYLINE_2D_H_
 
 // Wolf
-#include "base/landmark/landmark_base.h"
+#include "core/landmark/landmark_base.h"
 #include "laser/processor/polyline_2D_utils.h"
 
 // STL
diff --git a/include/laser/processor/polyline_2D_utils.h b/include/laser/processor/polyline_2D_utils.h
index f4adb3d67..4c08d4af1 100644
--- a/include/laser/processor/polyline_2D_utils.h
+++ b/include/laser/processor/polyline_2D_utils.h
@@ -8,12 +8,12 @@
 #ifndef POLYLINE_2D_UTILS_H_
 #define POLYLINE_2D_UTILS_H_
 
-#include "base/common/wolf.h"
+#include "core/common/wolf.h"
 #include "laser/landmark/landmark_match_polyline_2D.h"
 #include "laser/landmark/landmark_polyline_2D.h"
 #include "laser/feature/feature_match_polyline_2D.h"
 #include "laser/feature/feature_polyline_2D.h"
-#include "base/math/rotations.h"
+#include "core/math/rotations.h"
 
 namespace wolf {
 
diff --git a/include/laser/processor/processor_polyline.h b/include/laser/processor/processor_polyline.h
index 3615dcf35..954b0e5e6 100644
--- a/include/laser/processor/processor_polyline.h
+++ b/include/laser/processor/processor_polyline.h
@@ -12,12 +12,12 @@
 #include "laser/sensor/sensor_laser_2D.h"
 #include "laser/capture/capture_laser_2D.h"
 #include "laser/feature/feature_polyline_2D.h"
-#include "base/landmark/landmark_match.h"
+#include "core/landmark/landmark_match.h"
 #include "laser/landmark/landmark_polyline_2D.h"
 #include "laser/factor/factor_point_2D.h"
 #include "laser/factor/factor_point_to_line_2D.h"
-#include "base/state_block/state_block.h"
-#include "base/processor/processor_base.h"
+#include "core/state_block/state_block.h"
+#include "core/processor/processor_base.h"
 
 //laser_scan_utils
 #include "laser_scan_utils/laser_scan.h"
diff --git a/include/laser/processor/processor_tracker_feature_polyline_2D.h b/include/laser/processor/processor_tracker_feature_polyline_2D.h
index 286e5750b..add094f3d 100644
--- a/include/laser/processor/processor_tracker_feature_polyline_2D.h
+++ b/include/laser/processor/processor_tracker_feature_polyline_2D.h
@@ -9,7 +9,7 @@
 #define PROCESSOR_TRACKER_FEATURE_POLYLINE_2D_H_
 
 #include "laser/processor/polyline_2D_utils.h"
-#include "base/processor/processor_tracker_feature.h"
+#include "core/processor/processor_tracker_feature.h"
 #include "laser/landmark/landmark_polyline_2D.h"
 #include "laser/landmark/landmark_match_polyline_2D.h"
 #include "laser/sensor/sensor_laser_2D.h"
diff --git a/include/laser/sensor/sensor_laser_2D.h b/include/laser/sensor/sensor_laser_2D.h
index 6b927c5b4..89d3ce768 100644
--- a/include/laser/sensor/sensor_laser_2D.h
+++ b/include/laser/sensor/sensor_laser_2D.h
@@ -4,7 +4,7 @@
 #define SENSOR_LASER_2D_H_
 
 //wolf
-#include "base/sensor/sensor_base.h"
+#include "core/sensor/sensor_base.h"
 
 //laser_scan_utils
 #include "laser_scan_utils/laser_scan.h"
diff --git a/include/laser/state_block/local_parametrization_polyline_extreme.h b/include/laser/state_block/local_parametrization_polyline_extreme.h
index 0e0cc29cd..ce025e740 100644
--- a/include/laser/state_block/local_parametrization_polyline_extreme.h
+++ b/include/laser/state_block/local_parametrization_polyline_extreme.h
@@ -8,7 +8,7 @@
 #ifndef LOCAL_PARAMETRIZATION_POLYLINE_EXTREME_H_
 #define LOCAL_PARAMETRIZATION_POLYLINE_EXTREME_H_
 
-#include "base/state_block/local_parametrization_base.h"
+#include "core/state_block/local_parametrization_base.h"
 
 namespace wolf {
 
diff --git a/serialization/cereal/serialization_local_parametrization_base.h b/serialization/cereal/serialization_local_parametrization_base.h
index 1385e1af0..b43c35673 100644
--- a/serialization/cereal/serialization_local_parametrization_base.h
+++ b/serialization/cereal/serialization_local_parametrization_base.h
@@ -1,7 +1,7 @@
 #ifndef _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_H_
 #define _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_H_
 
-#include "base/state_block/local_parametrization_base.h"
+#include "core/state_block/local_parametrization_base.h"
 
 #include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>
diff --git a/serialization/cereal/serialization_local_parametrization_homogeneous.h b/serialization/cereal/serialization_local_parametrization_homogeneous.h
index 2b36232d5..9fcc656d5 100644
--- a/serialization/cereal/serialization_local_parametrization_homogeneous.h
+++ b/serialization/cereal/serialization_local_parametrization_homogeneous.h
@@ -1,7 +1,7 @@
 #ifndef _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_HOMOGENEOUS_H_
 #define _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_HOMOGENEOUS_H_
 
-#include "base/local_parametrization_homogeneous.h"
+#include "core/local_parametrization_homogeneous.h"
 
 #include "serialization_local_parametrization_base.h"
 
diff --git a/serialization/cereal/serialization_local_parametrization_quaternion.h b/serialization/cereal/serialization_local_parametrization_quaternion.h
index 95c71f4c2..66fe30a36 100644
--- a/serialization/cereal/serialization_local_parametrization_quaternion.h
+++ b/serialization/cereal/serialization_local_parametrization_quaternion.h
@@ -1,7 +1,7 @@
 #ifndef WOLF_IO_SERIALIZATION_LOCAL_PARAMETRIZATION_QUATERNION_H_
 #define WOLF_IO_SERIALIZATION_LOCAL_PARAMETRIZATION_QUATERNION_H_
 
-#include "base/local_parametrization_quaternion.h"
+#include "core/local_parametrization_quaternion.h"
 
 #include "serialization_local_parametrization_base.h"
 
diff --git a/serialization/cereal/serialization_node_base.h b/serialization/cereal/serialization_node_base.h
index 5a0a039a3..a2c592d69 100644
--- a/serialization/cereal/serialization_node_base.h
+++ b/serialization/cereal/serialization_node_base.h
@@ -2,7 +2,7 @@
 #define _WOLF_IO_CEREAL_NODE_BASE_H_
 
 // Wolf includes
-#include "base/node_base.h"
+#include "core/node_base.h"
 
 #include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>
diff --git a/serialization/cereal/serialization_processor_odom2d_params.h b/serialization/cereal/serialization_processor_odom2d_params.h
index 2056f6de9..dc0416b94 100644
--- a/serialization/cereal/serialization_processor_odom2d_params.h
+++ b/serialization/cereal/serialization_processor_odom2d_params.h
@@ -2,7 +2,7 @@
 #define _WOLF_SERIALIZATION_CEREAL_PROCESSOR_ODOM2D_PARAMS_H_
 
 // Wolf includes
-#include "base/processor/processor_odom_2D.h"
+#include "core/processor/processor_odom_2D.h"
 #include "serialization_processor_params_base.h"
 
 namespace cereal {
diff --git a/serialization/cereal/serialization_processor_odom3d_params.h b/serialization/cereal/serialization_processor_odom3d_params.h
index 1556a39e4..d2fd7c077 100644
--- a/serialization/cereal/serialization_processor_odom3d_params.h
+++ b/serialization/cereal/serialization_processor_odom3d_params.h
@@ -2,7 +2,7 @@
 #define _WOLF_SERIALIZATION_CEREAL_PROCESSOR_ODOM3D_PARAMS_H_
 
 // Wolf includes
-#include "base/processor/processor_odom_3D.h"
+#include "core/processor/processor_odom_3D.h"
 #include "serialization_processor_params_base.h"
 
 namespace cereal {
diff --git a/serialization/cereal/serialization_processor_params_base.h b/serialization/cereal/serialization_processor_params_base.h
index 2c75b85c9..03ea158c0 100644
--- a/serialization/cereal/serialization_processor_params_base.h
+++ b/serialization/cereal/serialization_processor_params_base.h
@@ -2,7 +2,7 @@
 #define _WOLF_SERIALIZATION_CEREAL_PROCESSOR_PARAM_BASE_H_
 
 // Wolf includes
-#include "base/processor/processor_base.h"
+#include "core/processor/processor_base.h"
 
 #include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>
diff --git a/serialization/cereal/serialization_sensor_intrinsic_base.h b/serialization/cereal/serialization_sensor_intrinsic_base.h
index 3e3b1cdb4..86b2a9b48 100644
--- a/serialization/cereal/serialization_sensor_intrinsic_base.h
+++ b/serialization/cereal/serialization_sensor_intrinsic_base.h
@@ -2,7 +2,7 @@
 #define _WOLF_SERIALIZATION_CEREAL_SENSOR_INTRINSIC_BASE_H_
 
 // Wolf includes
-#include "base/sensor/sensor_base.h"
+#include "core/sensor/sensor_base.h"
 
 #include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>
diff --git a/serialization/cereal/serialization_sensor_odom2d_intrinsic.h b/serialization/cereal/serialization_sensor_odom2d_intrinsic.h
index ccfe569a7..17d4160b3 100644
--- a/serialization/cereal/serialization_sensor_odom2d_intrinsic.h
+++ b/serialization/cereal/serialization_sensor_odom2d_intrinsic.h
@@ -2,7 +2,7 @@
 #define _WOLF_SERIALIZATION_CEREAL_SENSOR_ODOM2D_INTRINSIC_H_
 
 // Wolf includes
-#include "base/sensor/sensor_odom_2D.h"
+#include "core/sensor/sensor_odom_2D.h"
 
 #include "serialization_sensor_intrinsic_base.h"
 
diff --git a/serialization/cereal/serialization_time_stamp.h b/serialization/cereal/serialization_time_stamp.h
index 6cc9e29c7..f0c978d36 100644
--- a/serialization/cereal/serialization_time_stamp.h
+++ b/serialization/cereal/serialization_time_stamp.h
@@ -2,7 +2,7 @@
 #define _WOLF_IO_CEREAL_TIME_STAMP_H_
 
 // Wolf includes
-#include "base/time_stamp.h"
+#include "core/time_stamp.h"
 
 #include <cereal/cereal.hpp>
 
diff --git a/src/examples/solver/test_ccolamd.cpp b/src/examples/solver/test_ccolamd.cpp
index d9eec5b00..48831f651 100644
--- a/src/examples/solver/test_ccolamd.cpp
+++ b/src/examples/solver/test_ccolamd.cpp
@@ -6,7 +6,7 @@
  */
 
 // Wolf includes
-#include "base/common/wolf.h"
+#include "core/common/wolf.h"
 
 //std includes
 #include <cstdlib>
diff --git a/src/examples/solver/test_iQR_wolf2.cpp b/src/examples/solver/test_iQR_wolf2.cpp
index dc4094304..9ad57098e 100644
--- a/src/examples/solver/test_iQR_wolf2.cpp
+++ b/src/examples/solver/test_iQR_wolf2.cpp
@@ -17,9 +17,9 @@
 #include <queue>
 
 //Wolf includes
-#include "base/state_block/state_block.h"
-#include "base/factor/factor_base.h"
-#include "base/sensor/sensor_laser_2D.h"
+#include "core/state_block/state_block.h"
+#include "core/factor/factor_base.h"
+#include "core/sensor/sensor_laser_2D.h"
 #include "wolf_manager.h"
 
 // wolf solver
@@ -35,7 +35,7 @@
 
 //Ceres includes
 #include "glog/logging.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 //laser_scan_utils
 #include "iri-algorithms/laser_scan_utils/corner_detector.h"
diff --git a/src/examples/test_2_lasers_offline.cpp b/src/examples/test_2_lasers_offline.cpp
index 9174dc94f..58e91c6d8 100644
--- a/src/examples/test_2_lasers_offline.cpp
+++ b/src/examples/test_2_lasers_offline.cpp
@@ -1,5 +1,5 @@
 //std includes
-#include "base/sensor/sensor_GPS_fix.h"
+#include "core/sensor/sensor_GPS_fix.h"
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
@@ -17,12 +17,12 @@
 #include "glog/logging.h"
 
 //Wolf includes
-#include "base/problem/problem.h"
-#include "base/processor/processor_tracker_landmark_corner.h"
-#include "base/processor/processor_odom_2D.h"
-#include "base/sensor/sensor_laser_2D.h"
-#include "base/sensor/sensor_odom_2D.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/problem/problem.h"
+#include "core/processor/processor_tracker_landmark_corner.h"
+#include "core/processor/processor_odom_2D.h"
+#include "core/sensor/sensor_laser_2D.h"
+#include "core/sensor/sensor_odom_2D.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // laserscanutils
 #include "laser_scan_utils/line_finder_iterative.h"
@@ -31,7 +31,7 @@
 //C includes for sleep, time and main args
 #include "unistd.h"
 
-#include "base/capture/capture_pose.h"
+#include "core/capture/capture_pose.h"
 //faramotics includes
 #include "faramotics/dynamicSceneRender.h"
 #include "faramotics/rangeScan2D.h"
diff --git a/src/examples/test_analytic_odom_factor.cpp b/src/examples/test_analytic_odom_factor.cpp
index 344c284e2..32a2cbc64 100644
--- a/src/examples/test_analytic_odom_factor.cpp
+++ b/src/examples/test_analytic_odom_factor.cpp
@@ -12,8 +12,8 @@
 
 //Wolf includes
 #include "wolf_manager.h"
-#include "base/capture/capture_void.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_void.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // EIGEN
 //#include <Eigen/CholmodSupport>
diff --git a/src/examples/test_autodiff.cpp b/src/examples/test_autodiff.cpp
index a4c75ccde..6fa1e01ed 100644
--- a/src/examples/test_autodiff.cpp
+++ b/src/examples/test_autodiff.cpp
@@ -17,8 +17,8 @@
 
 //Wolf includes
 #include "wolf_manager.h"
-#include "base/sensor/sensor_laser_2D.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/sensor/sensor_laser_2D.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 //C includes for sleep, time and main args
 #include "unistd.h"
diff --git a/src/examples/test_capture_laser_2D.cpp b/src/examples/test_capture_laser_2D.cpp
index 8ca0e376b..cd5e40239 100644
--- a/src/examples/test_capture_laser_2D.cpp
+++ b/src/examples/test_capture_laser_2D.cpp
@@ -3,7 +3,7 @@
 #include <random>
 
 //wolf
-#include "base/capture/capture_laser_2D.h"
+#include "core/capture/capture_laser_2D.h"
 
 // Eigen in std vector
 #include <Eigen/StdVector>
diff --git a/src/examples/test_ceres_2_lasers.cpp b/src/examples/test_ceres_2_lasers.cpp
index d12f491de..b090a8a5a 100644
--- a/src/examples/test_ceres_2_lasers.cpp
+++ b/src/examples/test_ceres_2_lasers.cpp
@@ -1,5 +1,5 @@
 //std includes
-#include "base/sensor/sensor_GPS_fix.h"
+#include "core/sensor/sensor_GPS_fix.h"
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
@@ -17,12 +17,12 @@
 #include "glog/logging.h"
 
 //Wolf includes
-#include "base/problem/problem.h"
-#include "base/processor/processor_tracker_landmark_corner.h"
-#include "base/processor/processor_odom_2D.h"
-#include "base/sensor/sensor_laser_2D.h"
-#include "base/sensor/sensor_odom_2D.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/problem/problem.h"
+#include "core/processor/processor_tracker_landmark_corner.h"
+#include "core/processor/processor_odom_2D.h"
+#include "core/sensor/sensor_laser_2D.h"
+#include "core/sensor/sensor_odom_2D.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // laserscanutils
 #include "laser_scan_utils/line_finder_iterative.h"
@@ -31,7 +31,7 @@
 //C includes for sleep, time and main args
 #include "unistd.h"
 
-#include "base/capture/capture_pose.h"
+#include "core/capture/capture_pose.h"
 //faramotics includes
 #include "faramotics/dynamicSceneRender.h"
 #include "faramotics/rangeScan2D.h"
diff --git a/src/examples/test_ceres_2_lasers_polylines.cpp b/src/examples/test_ceres_2_lasers_polylines.cpp
index 136ba285e..7e83dec25 100644
--- a/src/examples/test_ceres_2_lasers_polylines.cpp
+++ b/src/examples/test_ceres_2_lasers_polylines.cpp
@@ -1,5 +1,5 @@
 //std includes
-#include "base/sensor/sensor_GPS_fix.h"
+#include "core/sensor/sensor_GPS_fix.h"
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
@@ -17,12 +17,12 @@
 #include "glog/logging.h"
 
 //Wolf includes
-#include "base/problem/problem.h"
-#include "base/processor/processor_tracker_landmark_polyline.h"
-#include "base/processor/processor_odom_2D.h"
-#include "base/sensor/sensor_laser_2D.h"
-#include "base/sensor/sensor_odom_2D.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/problem/problem.h"
+#include "core/processor/processor_tracker_landmark_polyline.h"
+#include "core/processor/processor_odom_2D.h"
+#include "core/sensor/sensor_laser_2D.h"
+#include "core/sensor/sensor_odom_2D.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // laserscanutils
 #include "laser_scan_utils/line_finder_iterative.h"
@@ -31,7 +31,7 @@
 //C includes for sleep, time and main args
 #include "unistd.h"
 
-#include "base/capture/capture_pose.h"
+#include "core/capture/capture_pose.h"
 //faramotics includes
 #include "faramotics/dynamicSceneRender.h"
 #include "faramotics/rangeScan2D.h"
diff --git a/src/examples/test_diff_drive.cpp b/src/examples/test_diff_drive.cpp
index 23980071f..21c2a8b94 100644
--- a/src/examples/test_diff_drive.cpp
+++ b/src/examples/test_diff_drive.cpp
@@ -6,11 +6,11 @@
  */
 
 //Wolf
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/sensor/sensor_diff_drive.h"
-#include "base/capture/capture_wheel_joint_position.h"
-#include "base/processor/processor_diff_drive.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/sensor/sensor_diff_drive.h"
+#include "core/capture/capture_wheel_joint_position.h"
+#include "core/processor/processor_diff_drive.h"
 
 //std
 #include <iostream>
diff --git a/src/examples/test_eigen_quaternion.cpp b/src/examples/test_eigen_quaternion.cpp
index d24a715cb..1e85039d7 100644
--- a/src/examples/test_eigen_quaternion.cpp
+++ b/src/examples/test_eigen_quaternion.cpp
@@ -6,7 +6,7 @@
 #include <eigen3/Eigen/Geometry>
 
 //Wolf
-#include "base/common/wolf.h"
+#include "core/common/wolf.h"
 
 int main()
 {
diff --git a/src/examples/test_factor_AHP.cpp b/src/examples/test_factor_AHP.cpp
index 75031dff8..10c7610ca 100644
--- a/src/examples/test_factor_AHP.cpp
+++ b/src/examples/test_factor_AHP.cpp
@@ -1,10 +1,10 @@
-#include "base/math/pinhole_tools.h"
-#include "base/landmark/landmark_AHP.h"
-#include "base/factor/factor_AHP.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
-#include "base/sensor/sensor_camera.h"
-#include "base/capture/capture_image.h"
+#include "core/math/pinhole_tools.h"
+#include "core/landmark/landmark_AHP.h"
+#include "core/factor/factor_AHP.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
+#include "core/sensor/sensor_camera.h"
+#include "core/capture/capture_image.h"
 
 int main()
 {
diff --git a/src/examples/test_factor_imu.cpp b/src/examples/test_factor_imu.cpp
index 3d0483e96..9d7d73379 100644
--- a/src/examples/test_factor_imu.cpp
+++ b/src/examples/test_factor_imu.cpp
@@ -1,14 +1,14 @@
 //Wolf
-#include "base/capture/capture_IMU.h"
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
-#include "base/capture/capture_pose.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/factor/factor_odom_3D.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_IMU.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/capture/capture_pose.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/factor/factor_odom_3D.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 //#define DEBUG_RESULTS
 
diff --git a/src/examples/test_factor_odom_3D.cpp b/src/examples/test_factor_odom_3D.cpp
index 77fa4c802..be7a81c4f 100644
--- a/src/examples/test_factor_odom_3D.cpp
+++ b/src/examples/test_factor_odom_3D.cpp
@@ -5,7 +5,7 @@
  *      Author: jsola
  */
 
-#include "base/factor/factor_odom_3D.h"
+#include "core/factor/factor_odom_3D.h"
 
 namespace wolf
 {
diff --git a/src/examples/test_faramotics_simulation.cpp b/src/examples/test_faramotics_simulation.cpp
index e095e561d..4414520dc 100644
--- a/src/examples/test_faramotics_simulation.cpp
+++ b/src/examples/test_faramotics_simulation.cpp
@@ -16,10 +16,10 @@
 #include "unistd.h"
 
 // wolf
-#include "base/common/wolf.h"
-#include "base/feature/feature_base.h"
-#include "base/landmark/landmark_base.h"
-#include "base/state_block/state_block.h"
+#include "core/common/wolf.h"
+#include "core/feature/feature_base.h"
+#include "core/landmark/landmark_base.h"
+#include "core/state_block/state_block.h"
 
 //faramotics includes
 #include "faramotics/dynamicSceneRender.h"
diff --git a/src/examples/test_image.cpp b/src/examples/test_image.cpp
index b2b61f520..842a6a14b 100644
--- a/src/examples/test_image.cpp
+++ b/src/examples/test_image.cpp
@@ -1,10 +1,10 @@
 // Testing things for the 3D image odometry
 
 //Wolf includes
-#include "base/sensor/sensor_camera.h"
-#include "base/capture/capture_image.h"
-#include "base/processor/processor_tracker_feature_image.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/sensor/sensor_camera.h"
+#include "core/capture/capture_image.h"
+#include "core/processor/processor_tracker_feature_image.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // Vision utils includes
 #include <vision_utils.h>
diff --git a/src/examples/test_imuDock.cpp b/src/examples/test_imuDock.cpp
index dab6894d7..c05fbbf9c 100644
--- a/src/examples/test_imuDock.cpp
+++ b/src/examples/test_imuDock.cpp
@@ -5,21 +5,21 @@
  *      \author: Dinesh Atchuthan
  */
 
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/ceres_wrapper/ceres_manager.h"
-#include "base/sensor/sensor_odom_3D.h"
-#include "base/processor/processor_odom_3D.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/ceres_wrapper/ceres_manager.h"
+#include "core/sensor/sensor_odom_3D.h"
+#include "core/processor/processor_odom_3D.h"
 
 //Factors headers
-#include "base/factor/factor_fix_bias.h"
+#include "core/factor/factor_fix_bias.h"
 
 //std
 #include <iostream>
 #include <fstream>
-#include "base/factor/factor_pose_3D.h"
+#include "core/factor/factor_pose_3D.h"
 
 #define OUTPUT_RESULTS
 //#define ADD_KF3
diff --git a/src/examples/test_imuDock_autoKFs.cpp b/src/examples/test_imuDock_autoKFs.cpp
index 43a54d654..039615445 100644
--- a/src/examples/test_imuDock_autoKFs.cpp
+++ b/src/examples/test_imuDock_autoKFs.cpp
@@ -5,21 +5,21 @@
  *      \author: Dinesh Atchuthan
  */
 
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/ceres_wrapper/ceres_manager.h"
-#include "base/sensor/sensor_odom_3D.h"
-#include "base/processor/processor_odom_3D.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/ceres_wrapper/ceres_manager.h"
+#include "core/sensor/sensor_odom_3D.h"
+#include "core/processor/processor_odom_3D.h"
 
 //Factors headers
-#include "base/factor/factor_fix_bias.h"
+#include "core/factor/factor_fix_bias.h"
 
 //std
 #include <iostream>
 #include <fstream>
-#include "base/factor/factor_pose_3D.h"
+#include "core/factor/factor_pose_3D.h"
 
 #define OUTPUT_RESULTS
 //#define AUTO_KFS
diff --git a/src/examples/test_imuPlateform_Offline.cpp b/src/examples/test_imuPlateform_Offline.cpp
index 4b923de89..e0e4e4778 100644
--- a/src/examples/test_imuPlateform_Offline.cpp
+++ b/src/examples/test_imuPlateform_Offline.cpp
@@ -1,15 +1,15 @@
 //Wolf
-#include "base/capture/capture_IMU.h"
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/sensor/sensor_odom_3D.h"
-#include "base/factor/factor_odom_3D.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
-#include "base/processor/processor_odom_3D.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_IMU.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/sensor/sensor_odom_3D.h"
+#include "core/factor/factor_odom_3D.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
+#include "core/processor/processor_odom_3D.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 //std
 #include <iostream>
diff --git a/src/examples/test_imu_constrained0.cpp b/src/examples/test_imu_constrained0.cpp
index e542e18e0..817b08a14 100644
--- a/src/examples/test_imu_constrained0.cpp
+++ b/src/examples/test_imu_constrained0.cpp
@@ -1,15 +1,15 @@
 //Wolf
-#include "base/capture/capture_IMU.h"
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/sensor/sensor_odom_3D.h"
-#include "base/factor/factor_odom_3D.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
-#include "base/processor/processor_odom_3D.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_IMU.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/sensor/sensor_odom_3D.h"
+#include "core/factor/factor_odom_3D.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
+#include "core/processor/processor_odom_3D.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 //std
 #include <iostream>
diff --git a/src/examples/test_kf_callback.cpp b/src/examples/test_kf_callback.cpp
index 05bd16597..ea1079d75 100644
--- a/src/examples/test_kf_callback.cpp
+++ b/src/examples/test_kf_callback.cpp
@@ -5,10 +5,10 @@
  *      Author: jsola
  */
 
-#include "base/sensor/sensor_odom_2D.h"
-#include "base/processor/processor_odom_2D.h"
-#include "base/processor/processor_tracker_feature_dummy.h"
-#include "base/capture/capture_void.h"
+#include "core/sensor/sensor_odom_2D.h"
+#include "core/processor/processor_odom_2D.h"
+#include "core/processor/processor_tracker_feature_dummy.h"
+#include "core/capture/capture_void.h"
 
 int main()
 {
diff --git a/src/examples/test_map_yaml.cpp b/src/examples/test_map_yaml.cpp
index 2dd5ab64d..c4ba44c55 100644
--- a/src/examples/test_map_yaml.cpp
+++ b/src/examples/test_map_yaml.cpp
@@ -5,13 +5,13 @@
  *      \author: jsola
  */
 
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/map/map_base.h"
-#include "base/landmark/landmark_polyline_2D.h"
-#include "base/landmark/landmark_AHP.h"
-#include "base/state_block/state_block.h"
-#include "base/yaml/yaml_conversion.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/map/map_base.h"
+#include "core/landmark/landmark_polyline_2D.h"
+#include "core/landmark/landmark_AHP.h"
+#include "core/state_block/state_block.h"
+#include "core/yaml/yaml_conversion.h"
 
 #include <iostream>
 using namespace wolf;
diff --git a/src/examples/test_mpu.cpp b/src/examples/test_mpu.cpp
index 1fbed214f..f2d5bbade 100644
--- a/src/examples/test_mpu.cpp
+++ b/src/examples/test_mpu.cpp
@@ -6,11 +6,11 @@
  */
 
  //Wolf
-#include "base/capture/capture_IMU.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/capture/capture_IMU.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -18,8 +18,8 @@
 #include <cmath>
 #include <termios.h>
 #include <fcntl.h>
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
 
 #define DEBUG_RESULTS
 #define FROM_FILE
diff --git a/src/examples/test_processor_imu.cpp b/src/examples/test_processor_imu.cpp
index 33ec4cabb..ec77aedee 100644
--- a/src/examples/test_processor_imu.cpp
+++ b/src/examples/test_processor_imu.cpp
@@ -6,13 +6,13 @@
  */
 
 //Wolf
-#include "base/capture/capture_IMU.h"
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_IMU.h"
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/capture/capture_IMU.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 #include <iostream>
 #include <fstream>
 #include <iomanip>
diff --git a/src/examples/test_processor_imu_jacobians.cpp b/src/examples/test_processor_imu_jacobians.cpp
index 22c797d6d..988244d15 100644
--- a/src/examples/test_processor_imu_jacobians.cpp
+++ b/src/examples/test_processor_imu_jacobians.cpp
@@ -6,13 +6,13 @@
  */
 
 //Wolf
-#include "base/capture/capture_IMU.h"
-#include "base/sensor/sensor_IMU.h"
+#include "core/capture/capture_IMU.h"
+#include "core/sensor/sensor_IMU.h"
 #include <test/processor_IMU_UnitTester.h>
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 #include <iostream>
 #include <fstream>
 #include <iomanip>
diff --git a/src/examples/test_processor_odom_3D.cpp b/src/examples/test_processor_odom_3D.cpp
index 79798150d..8103a7ff3 100644
--- a/src/examples/test_processor_odom_3D.cpp
+++ b/src/examples/test_processor_odom_3D.cpp
@@ -5,13 +5,13 @@
  *      \author: jsola
  */
 
-#include "base/capture/capture_IMU.h"
-#include "base/problem/problem.h"
-#include "base/sensor/sensor_odom_2D.h"
-#include "base/processor/processor_odom_3D.h"
-#include "base/map/map_base.h"
-#include "base/landmark/landmark_base.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_IMU.h"
+#include "core/problem/problem.h"
+#include "core/sensor/sensor_odom_2D.h"
+#include "core/processor/processor_odom_3D.h"
+#include "core/map/map_base.h"
+#include "core/landmark/landmark_base.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 #include <cstdlib>
 
diff --git a/src/examples/test_processor_tracker_feature.cpp b/src/examples/test_processor_tracker_feature.cpp
index 89a213f43..a5c2476d7 100644
--- a/src/examples/test_processor_tracker_feature.cpp
+++ b/src/examples/test_processor_tracker_feature.cpp
@@ -9,12 +9,12 @@
 #include <iostream>
 
 //Wolf
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/sensor/sensor_base.h"
-#include "base/state_block/state_block.h"
-#include "base/processor/processor_tracker_feature_dummy.h"
-#include "base/capture/capture_void.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/sensor/sensor_base.h"
+#include "core/state_block/state_block.h"
+#include "core/processor/processor_tracker_feature_dummy.h"
+#include "core/capture/capture_void.h"
 
 void print_prc(wolf::ProcessorTrackerFeaturePtr _prc)
 {
diff --git a/src/examples/test_processor_tracker_landmark.cpp b/src/examples/test_processor_tracker_landmark.cpp
index 170222976..05eb1a519 100644
--- a/src/examples/test_processor_tracker_landmark.cpp
+++ b/src/examples/test_processor_tracker_landmark.cpp
@@ -9,12 +9,12 @@
 #include <iostream>
 
 //Wolf
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/sensor/sensor_base.h"
-#include "base/state_block/state_block.h"
-#include "base/processor/processor_tracker_landmark_dummy.h"
-#include "base/capture/capture_void.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/sensor/sensor_base.h"
+#include "core/state_block/state_block.h"
+#include "core/processor/processor_tracker_landmark_dummy.h"
+#include "core/capture/capture_void.h"
 
 void print_problem_pointers(wolf::ProblemPtr wolf_problem_ptr_)
 {
diff --git a/src/examples/test_processor_tracker_landmark_image.cpp b/src/examples/test_processor_tracker_landmark_image.cpp
index be7df536e..f3c79633d 100644
--- a/src/examples/test_processor_tracker_landmark_image.cpp
+++ b/src/examples/test_processor_tracker_landmark_image.cpp
@@ -1,18 +1,18 @@
 //std
 #include <iostream>
 
-#include "base/processor/processor_tracker_landmark_image.h"
+#include "core/processor/processor_tracker_landmark_image.h"
 
 //Wolf
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/state_block/state_block.h"
-#include "base/processor/processor_odom_3D.h"
-#include "base/sensor/sensor_odom_3D.h"
-#include "base/sensor/sensor_camera.h"
-#include "base/capture/capture_image.h"
-#include "base/capture/capture_pose.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/state_block/state_block.h"
+#include "core/processor/processor_odom_3D.h"
+#include "core/sensor/sensor_odom_3D.h"
+#include "core/sensor/sensor_camera.h"
+#include "core/capture/capture_image.h"
+#include "core/capture/capture_pose.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // Vision utils includes
 #include <vision_utils.h>
diff --git a/src/examples/test_projection_points.cpp b/src/examples/test_projection_points.cpp
index b9f01912d..6d6f943ab 100644
--- a/src/examples/test_projection_points.cpp
+++ b/src/examples/test_projection_points.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 
 //wolf includes
-#include "base/math/pinhole_tools.h"
+#include "core/math/pinhole_tools.h"
 
 int main(int argc, char** argv)
 {
diff --git a/src/examples/test_simple_AHP.cpp b/src/examples/test_simple_AHP.cpp
index 6bd1805dc..290e0915c 100644
--- a/src/examples/test_simple_AHP.cpp
+++ b/src/examples/test_simple_AHP.cpp
@@ -5,15 +5,15 @@
  *      \author: jtarraso
  */
 
-#include "base/common/wolf.h"
-#include "base/frame/frame_base.h"
-#include "base/math/pinhole_tools.h"
-#include "base/sensor/sensor_camera.h"
-#include "base/math/rotations.h"
-#include "base/capture/capture_image.h"
-#include "base/landmark/landmark_AHP.h"
-#include "base/factor/factor_AHP.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/common/wolf.h"
+#include "core/frame/frame_base.h"
+#include "core/math/pinhole_tools.h"
+#include "core/sensor/sensor_camera.h"
+#include "core/math/rotations.h"
+#include "core/capture/capture_image.h"
+#include "core/landmark/landmark_AHP.h"
+#include "core/factor/factor_AHP.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // Vision utils
 #include <vision_utils/vision_utils.h>
diff --git a/src/examples/test_sort_keyframes.cpp b/src/examples/test_sort_keyframes.cpp
index 56982c9dc..b27e1c007 100644
--- a/src/examples/test_sort_keyframes.cpp
+++ b/src/examples/test_sort_keyframes.cpp
@@ -6,10 +6,10 @@
  */
 
 // Wolf includes
-#include "base/common/wolf.h"
-#include "base/problem/problem.h"
-#include "base/frame/frame_base.h"
-#include "base/trajectory/trajectory_base.h"
+#include "core/common/wolf.h"
+#include "core/problem/problem.h"
+#include "core/frame/frame_base.h"
+#include "core/trajectory/trajectory_base.h"
 
 // STL includes
 #include <list>
diff --git a/src/examples/test_sparsification.cpp b/src/examples/test_sparsification.cpp
index 7b9e85c08..fa577c15b 100644
--- a/src/examples/test_sparsification.cpp
+++ b/src/examples/test_sparsification.cpp
@@ -14,10 +14,10 @@
 #include <queue>
 
 //Wolf includes
-#include "base/capture/capture_void.h"
-#include "base/feature/feature_odom_2D.h"
-#include "base/factor/factor_base.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_void.h"
+#include "core/feature/feature_odom_2D.h"
+#include "core/factor/factor_base.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // EIGEN
 //#include <Eigen/CholmodSupport>
diff --git a/src/examples/test_state_quaternion.cpp b/src/examples/test_state_quaternion.cpp
index 0fabac44e..6528a2b39 100644
--- a/src/examples/test_state_quaternion.cpp
+++ b/src/examples/test_state_quaternion.cpp
@@ -5,9 +5,9 @@
  *      \author: jsola
  */
 
-#include "base/frame/frame_base.h"
-#include "base/state_block/state_quaternion.h"
-#include "base/common/time_stamp.h"
+#include "core/frame/frame_base.h"
+#include "core/state_block/state_quaternion.h"
+#include "core/common/time_stamp.h"
 
 #include <iostream>
 
diff --git a/src/examples/test_tracker_ORB.cpp b/src/examples/test_tracker_ORB.cpp
index 536e06d62..89ea1800a 100644
--- a/src/examples/test_tracker_ORB.cpp
+++ b/src/examples/test_tracker_ORB.cpp
@@ -11,7 +11,7 @@
 #include <matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h>
 
 //Wolf
-#include "base/processor/processor_tracker_landmark_image.h"
+#include "core/processor/processor_tracker_landmark_image.h"
 
 int main(int argc, char** argv)
 {
diff --git a/src/examples/test_wolf_autodiffwrapper.cpp b/src/examples/test_wolf_autodiffwrapper.cpp
index 1fa76e585..8d0897956 100644
--- a/src/examples/test_wolf_autodiffwrapper.cpp
+++ b/src/examples/test_wolf_autodiffwrapper.cpp
@@ -12,8 +12,8 @@
 
 //Wolf includes
 #include "wolf_manager.h"
-#include "base/capture/capture_void.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_void.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 int main(int argc, char** argv) 
 {
diff --git a/src/examples/test_wolf_factories.cpp b/src/examples/test_wolf_factories.cpp
index b608bb958..ce7db15c8 100644
--- a/src/examples/test_wolf_factories.cpp
+++ b/src/examples/test_wolf_factories.cpp
@@ -5,21 +5,21 @@
  *      \author: jsola
  */
 
-#include "base/processor/processor_IMU.h"
-#include "base/sensor/sensor_GPS_fix.h"
-#include "base/hardware/hardware_base.h"
-#include "base/sensor/sensor_camera.h"
-#include "base/sensor/sensor_odom_2D.h"
+#include "core/processor/processor_IMU.h"
+#include "core/sensor/sensor_GPS_fix.h"
+#include "core/hardware/hardware_base.h"
+#include "core/sensor/sensor_camera.h"
+#include "core/sensor/sensor_odom_2D.h"
 #include "../sensor_imu.h"
 //#include "../sensor_gps.h"
 
-#include "base/processor/processor_odom_2D.h"
-#include "base/processor/processor_odom_3D.h"
+#include "core/processor/processor_odom_2D.h"
+#include "core/processor/processor_odom_3D.h"
 #include "../processor_image_feature.h"
 
-#include "base/problem/problem.h"
+#include "core/problem/problem.h"
 
-#include "base/common/factory.h"
+#include "core/common/factory.h"
 
 #include <iostream>
 #include <iomanip>
diff --git a/src/examples/test_wolf_imported_graph.cpp b/src/examples/test_wolf_imported_graph.cpp
index 1113af8b7..9463399ff 100644
--- a/src/examples/test_wolf_imported_graph.cpp
+++ b/src/examples/test_wolf_imported_graph.cpp
@@ -12,8 +12,8 @@
 
 //Wolf includes
 #include "wolf_manager.h"
-#include "base/capture/capture_void.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_void.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // EIGEN
 //#include <Eigen/CholmodSupport>
diff --git a/src/examples/test_wolf_logging.cpp b/src/examples/test_wolf_logging.cpp
index 3b7bdfab7..ee3b9b576 100644
--- a/src/examples/test_wolf_logging.cpp
+++ b/src/examples/test_wolf_logging.cpp
@@ -5,8 +5,8 @@
  * \author: Jeremie Deray
  */
 
-#include "base/common/wolf.h"
-#include "base/utils/logging.h"
+#include "core/common/wolf.h"
+#include "core/utils/logging.h"
 
 int main(int, char*[])
 {
diff --git a/src/examples/test_wolf_prunning.cpp b/src/examples/test_wolf_prunning.cpp
index f3ed29007..de917e471 100644
--- a/src/examples/test_wolf_prunning.cpp
+++ b/src/examples/test_wolf_prunning.cpp
@@ -12,9 +12,9 @@
 
 //Wolf includes
 #include "wolf_manager.h"
-#include "base/capture/capture_void.h"
-#include "base/factor/factor_base.h"
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/capture/capture_void.h"
+#include "core/factor/factor_base.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 // EIGEN
 //#include <Eigen/CholmodSupport>
diff --git a/src/examples/test_wolf_root.cpp b/src/examples/test_wolf_root.cpp
index ff78c97b0..4ea048471 100644
--- a/src/examples/test_wolf_root.cpp
+++ b/src/examples/test_wolf_root.cpp
@@ -6,7 +6,7 @@
  */
 
 //Wolf
-#include "base/common/wolf.h"
+#include "core/common/wolf.h"
 
 //std
 #include <iostream>
diff --git a/src/examples/test_yaml.cpp b/src/examples/test_yaml.cpp
index 5181d73ac..5768f4b50 100644
--- a/src/examples/test_yaml.cpp
+++ b/src/examples/test_yaml.cpp
@@ -5,10 +5,10 @@
  *      \author: jsola
  */
 
-#include "base/math/pinhole_tools.h"
+#include "core/math/pinhole_tools.h"
 #include "yaml/yaml_conversion.h"
 #include "processor_image_feature.h"
-#include "base/common/factory.h"
+#include "core/common/factory.h"
 
 #include <yaml-cpp/yaml.h>
 
diff --git a/src/examples/test_yaml_conversions.cpp b/src/examples/test_yaml_conversions.cpp
index 78cf30da7..b8e1f41f9 100644
--- a/src/examples/test_yaml_conversions.cpp
+++ b/src/examples/test_yaml_conversions.cpp
@@ -5,7 +5,7 @@
  *      \author: jsola
  */
 
-#include "base/yaml/yaml_conversion.h"
+#include "core/yaml/yaml_conversion.h"
 
 #include <yaml-cpp/yaml.h>
 
diff --git a/src/landmark/landmark_polyline_2D.cpp b/src/landmark/landmark_polyline_2D.cpp
index 4ac703d00..ab06878f1 100644
--- a/src/landmark/landmark_polyline_2D.cpp
+++ b/src/landmark/landmark_polyline_2D.cpp
@@ -10,9 +10,9 @@
 #include "laser/state_block/local_parametrization_polyline_extreme.h"
 #include "laser/factor/factor_point_2D.h"
 #include "laser/factor/factor_point_to_line_2D.h"
-#include "base/state_block/state_block.h"
-#include "base/common/factory.h"
-#include "base/yaml/yaml_conversion.h"
+#include "core/state_block/state_block.h"
+#include "core/common/factory.h"
+#include "core/yaml/yaml_conversion.h"
 
 namespace wolf
 {
diff --git a/src/processor/processor_polyline.cpp b/src/processor/processor_polyline.cpp
index aa4fbca7a..52208cbaa 100644
--- a/src/processor/processor_polyline.cpp
+++ b/src/processor/processor_polyline.cpp
@@ -919,7 +919,7 @@ ProcessorBasePtr ProcessorPolyline::create(const std::string& _unique_name, cons
 } /* namespace wolf */
 
 // Register in the SensorFactory
-#include "base/processor/processor_factory.h"
+#include "core/processor/processor_factory.h"
 namespace wolf {
 WOLF_REGISTER_PROCESSOR("POLYLINE", ProcessorPolyline)
 } /* namespace wolf */
diff --git a/src/processor/processor_tracker_feature_polyline_2D.cpp b/src/processor/processor_tracker_feature_polyline_2D.cpp
index 3c17f3294..ec39aa406 100644
--- a/src/processor/processor_tracker_feature_polyline_2D.cpp
+++ b/src/processor/processor_tracker_feature_polyline_2D.cpp
@@ -1134,7 +1134,7 @@ ProcessorBasePtr ProcessorTrackerFeaturePolyline2D::create(const std::string& _u
 } /* namespace wolf */
 
 // Register in the SensorFactory
-#include "base/processor/processor_factory.h"
+#include "core/processor/processor_factory.h"
 namespace wolf {
 WOLF_REGISTER_PROCESSOR("TRACKER FEATURE POLYLINE", ProcessorTrackerFeaturePolyline2D)
 } /* namespace wolf */
diff --git a/src/sensor/sensor_GPS.cpp b/src/sensor/sensor_GPS.cpp
index f6c1eace8..666788225 100644
--- a/src/sensor/sensor_GPS.cpp
+++ b/src/sensor/sensor_GPS.cpp
@@ -1,7 +1,7 @@
 
-#include "base/sensor/sensor_GPS.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/sensor/sensor_GPS.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 
 namespace wolf {
 
@@ -50,7 +50,7 @@ SensorBasePtr SensorGPS::create(const std::string& _unique_name, const Eigen::Ve
 } // namespace wolf
 
 // Register in the SensorFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("GPS",SensorGPS)
 } // namespace wolf
diff --git a/src/sensor/sensor_GPS_fix.cpp b/src/sensor/sensor_GPS_fix.cpp
index 3c781095f..ca204f364 100644
--- a/src/sensor/sensor_GPS_fix.cpp
+++ b/src/sensor/sensor_GPS_fix.cpp
@@ -1,6 +1,6 @@
-#include "base/sensor/sensor_GPS_fix.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/sensor/sensor_GPS_fix.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 
 namespace wolf {
 
@@ -37,7 +37,7 @@ SensorBasePtr SensorGPSFix::create(const std::string& _unique_name, const Eigen:
 } // namespace wolf
 
 // Register in the SensorFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("GPS FIX", SensorGPSFix)
 } // namespace wolf
diff --git a/src/sensor/sensor_IMU.cpp b/src/sensor/sensor_IMU.cpp
index d5b684163..de0146784 100644
--- a/src/sensor/sensor_IMU.cpp
+++ b/src/sensor/sensor_IMU.cpp
@@ -1,6 +1,6 @@
-#include "base/sensor/sensor_IMU.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/sensor/sensor_IMU.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 
 namespace wolf {
 
@@ -43,7 +43,7 @@ SensorBasePtr SensorIMU::create(const std::string& _unique_name, const Eigen::Ve
 } // namespace wolf
 
 // Register in the SensorFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("IMU", SensorIMU)
 } // namespace wolf
diff --git a/src/sensor/sensor_base.cpp b/src/sensor/sensor_base.cpp
index 209dc12e0..26238eb8d 100644
--- a/src/sensor/sensor_base.cpp
+++ b/src/sensor/sensor_base.cpp
@@ -1,8 +1,8 @@
-#include "base/sensor/sensor_base.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
-#include "base/factor/factor_block_absolute.h"
-#include "base/factor/factor_quaternion_absolute.h"
+#include "core/sensor/sensor_base.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
+#include "core/factor/factor_block_absolute.h"
+#include "core/factor/factor_quaternion_absolute.h"
 
 
 namespace wolf {
diff --git a/src/sensor/sensor_diff_drive.cpp b/src/sensor/sensor_diff_drive.cpp
index 30c7e434f..3e07aea57 100644
--- a/src/sensor/sensor_diff_drive.cpp
+++ b/src/sensor/sensor_diff_drive.cpp
@@ -1,7 +1,7 @@
-#include "base/sensor/sensor_diff_drive.h"
-#include "base/state_block/state_block.h"
-#include "base/capture/capture_motion.h"
-#include "base/utils/eigen_assert.h"
+#include "core/sensor/sensor_diff_drive.h"
+#include "core/state_block/state_block.h"
+#include "core/capture/capture_motion.h"
+#include "core/utils/eigen_assert.h"
 
 namespace wolf {
 
@@ -127,7 +127,7 @@ SensorBasePtr SensorDiffDrive::create(const std::string& _unique_name,
 } // namespace wolf
 
 // Register in the SensorFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("DIFF DRIVE", SensorDiffDrive)
 } // namespace wolf
diff --git a/src/sensor/sensor_laser_2D.cpp b/src/sensor/sensor_laser_2D.cpp
index 0c92ffc39..41c5fb000 100644
--- a/src/sensor/sensor_laser_2D.cpp
+++ b/src/sensor/sensor_laser_2D.cpp
@@ -1,5 +1,5 @@
 #include "laser/sensor/sensor_laser_2D.h"
-#include "base/state_block/state_block.h"
+#include "core/state_block/state_block.h"
 
 namespace wolf {
 
@@ -82,7 +82,7 @@ SensorBasePtr SensorLaser2D::create(const std::string& _unique_name, const Eigen
 } // namespace wolf
 
 // Register in the SensorFactory and the ParameterFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 //#include "intrinsics_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("LASER 2D", SensorLaser2D)
diff --git a/src/sensor/sensor_odom_2D.cpp b/src/sensor/sensor_odom_2D.cpp
index dc3772d7b..e3e5d860f 100644
--- a/src/sensor/sensor_odom_2D.cpp
+++ b/src/sensor/sensor_odom_2D.cpp
@@ -1,6 +1,6 @@
-#include "base/sensor/sensor_odom_2D.h"
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_angle.h"
+#include "core/sensor/sensor_odom_2D.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_angle.h"
 
 namespace wolf {
 
@@ -61,7 +61,7 @@ SensorBasePtr SensorOdom2D::create(const std::string& _unique_name, const Eigen:
 } // namespace wolf
 
 // Register in the SensorFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("ODOM 2D", SensorOdom2D)
 } // namespace wolf
diff --git a/src/sensor/sensor_odom_3D.cpp b/src/sensor/sensor_odom_3D.cpp
index 5a3736d5e..cf6431489 100644
--- a/src/sensor/sensor_odom_3D.cpp
+++ b/src/sensor/sensor_odom_3D.cpp
@@ -5,10 +5,10 @@
  *      \author: jsola
  */
 
-#include "base/sensor/sensor_odom_3D.h"
+#include "core/sensor/sensor_odom_3D.h"
 
-#include "base/state_block/state_block.h"
-#include "base/state_block/state_quaternion.h"
+#include "core/state_block/state_block.h"
+#include "core/state_block/state_quaternion.h"
 
 namespace wolf {
 
@@ -57,7 +57,7 @@ SensorBasePtr SensorOdom3D::create(const std::string& _unique_name, const Eigen:
 } // namespace wolf
 
 // Register in the SensorFactory
-#include "base/sensor/sensor_factory.h"
+#include "core/sensor/sensor_factory.h"
 namespace wolf {
 WOLF_REGISTER_SENSOR("ODOM 3D", SensorOdom3D)
 }
diff --git a/src/solver_suitesparse/solver_manager.cpp b/src/solver_suitesparse/solver_manager.cpp
index 2ba7af708..05d89142a 100644
--- a/src/solver_suitesparse/solver_manager.cpp
+++ b/src/solver_suitesparse/solver_manager.cpp
@@ -1,4 +1,4 @@
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 SolverManager::SolverManager()
 {
diff --git a/src/state_block/local_parametrization_polyline_extreme.cpp b/src/state_block/local_parametrization_polyline_extreme.cpp
index eab8a7dfc..4116f5c03 100644
--- a/src/state_block/local_parametrization_polyline_extreme.cpp
+++ b/src/state_block/local_parametrization_polyline_extreme.cpp
@@ -1,6 +1,6 @@
 #include "laser/state_block/local_parametrization_polyline_extreme.h"
-#include "base/state_block/state_block.h"
-#include "base/math/rotations.h"
+#include "core/state_block/state_block.h"
+#include "core/math/rotations.h"
 
 namespace wolf {
 
diff --git a/src/yaml/sensor_laser_2D_yaml.cpp b/src/yaml/sensor_laser_2D_yaml.cpp
index 592fd2074..d741f365f 100644
--- a/src/yaml/sensor_laser_2D_yaml.cpp
+++ b/src/yaml/sensor_laser_2D_yaml.cpp
@@ -6,11 +6,11 @@
  */
 
 // wolf yaml
-#include "base/yaml/yaml_conversion.h"
+#include "core/yaml/yaml_conversion.h"
 
 // wolf
-//#include "base/intrinsics_factory.h"
-#include "base/common/factory.h"
+//#include "core/intrinsics_factory.h"
+#include "core/common/factory.h"
 #include "laser/sensor/sensor_laser_2D.h"
 
 // yaml library
diff --git a/test/gtest_processor_tracker_feature_polyline_2D.cpp b/test/gtest_processor_tracker_feature_polyline_2D.cpp
index 7aed00d56..fdda00d56 100644
--- a/test/gtest_processor_tracker_feature_polyline_2D.cpp
+++ b/test/gtest_processor_tracker_feature_polyline_2D.cpp
@@ -6,12 +6,12 @@
  */
 
 #include "laser/processor/processor_tracker_feature_polyline_2D.h"
-#include "base/common/wolf.h"
+#include "core/common/wolf.h"
 
 #include "utils_gtest.h"
-#include "base/utils/logging.h"
+#include "core/utils/logging.h"
 
-#include "base/ceres_wrapper/ceres_manager.h"
+#include "core/ceres_wrapper/ceres_manager.h"
 
 #include <cmath>
 #include <iostream>
-- 
GitLab