diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75ead290fe376886aae965111648743b72eb54ee..0809d9a08c0f725d6a2a88d22ae2a0d079960b92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,17 +233,17 @@ SET(HDRS_COMMON
   include/base/common/wolf.h
   )
 SET(HDRS_MATH
-  include/base/math/pinhole_tools.h
-  include/base/math/SE3.h
   include/base/math/IMU_tools.h
+  include/base/math/SE3.h
+  include/base/math/pinhole_tools.h
   include/base/math/rotations.h
   )
 SET(HDRS_UTILS
   include/base/utils/eigen_assert.h
   include/base/utils/eigen_predicates.h
   include/base/utils/logging.h
-  include/base/utils/singleton.h
   include/base/utils/make_unique.h
+  include/base/utils/singleton.h
   )
 SET(HDRS_PROBLEM
   include/base/problem/problem.h
@@ -270,7 +270,6 @@ SET(HDRS_STATE_BLOCK
   include/base/state_block/state_block.h
   include/base/state_block/state_homogeneous_3D.h
   include/base/state_block/state_quaternion.h
-  include/base/state_block/local_parametrization_polyline_extreme.h
   )
 
 SET(HDRS_CAPTURE
@@ -323,28 +322,21 @@ SET(HDRS_PROCESSOR
   include/base/processor/diff_drive_tools.hpp
   include/base/processor/motion_buffer.h
   include/base/processor/processor_IMU.h
-  include/base/processor/processor_IMU.h
   include/base/processor/processor_base.h
   include/base/processor/processor_capture_holder.h
   include/base/processor/processor_diff_drive.h
   include/base/processor/processor_factory.h
-  include/base/processor/processor_factory.h
-  include/base/processor/processor_frame_nearest_neighbor_filter.h
   include/base/processor/processor_frame_nearest_neighbor_filter.h
   include/base/processor/processor_logging.h
   include/base/processor/processor_loopclosure_base.h
   include/base/processor/processor_motion.h
   include/base/processor/processor_odom_2D.h
-  include/base/processor/processor_odom_2D.h
-  include/base/processor/processor_odom_3D.h
   include/base/processor/processor_odom_3D.h
   include/base/processor/processor_tracker.h
   include/base/processor/processor_tracker_feature.h
   include/base/processor/processor_tracker_feature_dummy.h
-  include/base/processor/processor_tracker_feature_dummy.h
   include/base/processor/processor_tracker_landmark.h
   include/base/processor/processor_tracker_landmark_dummy.h
-  include/base/processor/processor_tracker_landmark_dummy.h
   include/base/processor/track_matrix.h
   )
 SET(HDRS_SENSOR
@@ -359,14 +351,12 @@ SET(HDRS_SOLVER
   )
 
 SET(HDRS_DTASSC
-  include/base/association/association_solver.h
   include/base/association/association_node.h
   include/base/association/association_solver.h
   include/base/association/association_tree.h
   include/base/association/matrix.h
   )
 
-
 #SOURCES
 SET(SRCS_PROBLEM
   src/problem/problem.cpp
@@ -384,11 +374,11 @@ SET(SRCS_FRAME
   src/frame/frame_base.cpp
   )
 SET(SRCS_STATE_BLOCK
-  src/state_block/state_block.cpp
   src/state_block/local_parametrization_base.cpp
   src/state_block/local_parametrization_homogeneous.cpp
-  src/state_block/local_parametrization_quaternion.cpp
   src/state_block/local_parametrization_polyline_extreme.cpp
+  src/state_block/local_parametrization_quaternion.cpp
+  src/state_block/state_block.cpp
   )
 SET(SRCS_COMMON
   src/common/node_base.cpp
@@ -400,14 +390,14 @@ SET(SRCS_UTILS
   )
 
 SET(SRCS_CAPTURE
-  src/capture/capture_motion.cpp
-  src/capture/capture_base.cpp
-  src/capture/capture_pose.cpp
-  src/capture/capture_void.cpp
   src/capture/capture_IMU.cpp
+  src/capture/capture_base.cpp
+  src/capture/capture_motion.cpp
   src/capture/capture_odom_2D.cpp
   src/capture/capture_odom_3D.cpp
+  src/capture/capture_pose.cpp
   src/capture/capture_velocity.cpp
+  src/capture/capture_void.cpp
   src/capture/capture_wheel_joint_position.cpp
   )
 SET(SRCS_FACTOR
@@ -415,17 +405,17 @@ SET(SRCS_FACTOR
   src/factor/factor_base.cpp
   )
 SET(SRCS_FEATURE
+  src/feature/feature_base.cpp
   src/feature/feature_corner_2D.cpp
   src/feature/feature_diff_drive.cpp
   src/feature/feature_odom_2D.cpp
-  src/feature/feature_base.cpp
   src/feature/feature_pose.cpp
   )
 SET(SRCS_LANDMARK
+  src/landmark/landmark_base.cpp
   src/landmark/landmark_container.cpp
   src/landmark/landmark_corner_2D.cpp
   src/landmark/landmark_line_2D.cpp
-  src/landmark/landmark_base.cpp
   )
 SET(SRCS_PROCESSOR
   src/processor/motion_buffer.cpp
@@ -575,53 +565,53 @@ INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
 install(EXPORT ${PROJECT_NAME}Targets DESTINATION lib/cmake/${PROJECT_NAME})
 #install headers
 INSTALL(FILES ${HDRS_MATH}
-  DESTINATION include/iri-algorithms/wolf/base/math)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/math)
 INSTALL(FILES ${HDRS_UTILS}
-  DESTINATION include/iri-algorithms/wolf/base/utils)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/utils)
 INSTALL(FILES ${HDRS_PROBLEM}
-  DESTINATION include/iri-algorithms/wolf/base/problem)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/problem)
 INSTALL(FILES ${HDRS_HARDWARE}
-  DESTINATION include/iri-algorithms/wolf/base/hardware)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/hardware)
 INSTALL(FILES ${HDRS_TRAJECTORY}
-  DESTINATION include/iri-algorithms/wolf/base/trajectory)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/trajectory)
 INSTALL(FILES ${HDRS_MAP}
-  DESTINATION include/iri-algorithms/wolf/base/map)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/map)
 INSTALL(FILES ${HDRS_FRAME}
-  DESTINATION include/iri-algorithms/wolf/base/frame)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/frame)
 INSTALL(FILES ${HDRS_STATE_BLOCK}
-  DESTINATION include/iri-algorithms/wolf/base/state_block)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/state_block)
 INSTALL(FILES ${HDRS_COMMON}
-  DESTINATION include/iri-algorithms/wolf/base/common)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/common)
 INSTALL(FILES ${HDRS_DTASSC}
-  DESTINATION include/iri-algorithms/wolf/base/association)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/association)
 INSTALL(FILES ${HDRS_CAPTURE}
-   DESTINATION include/iri-algorithms/wolf/base/capture)
+   DESTINATION include/iri-algorithms/wolf/plugin_core/base/capture)
 INSTALL(FILES ${HDRS_FACTOR}
-  DESTINATION include/iri-algorithms/wolf/base/factor)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/factor)
 INSTALL(FILES ${HDRS_FEATURE}
-  DESTINATION include/iri-algorithms/wolf/base/feature)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/feature)
 INSTALL(FILES ${HDRS_SENSOR}
-  DESTINATION include/iri-algorithms/wolf/base/sensor)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/sensor)
 INSTALL(FILES ${HDRS_PROCESSOR}
-  DESTINATION include/iri-algorithms/wolf/base/processor)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/processor)
 INSTALL(FILES ${HDRS_LANDMARK}
-  DESTINATION include/iri-algorithms/wolf/base/landmark)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/landmark)
 INSTALL(FILES ${HDRS_WRAPPER}
-  DESTINATION include/iri-algorithms/wolf/base/ceres_wrapper)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/ceres_wrapper)
 INSTALL(FILES ${HDRS_SOLVER_SUITESPARSE}
-  DESTINATION include/iri-algorithms/wolf/base/solver_suitesparse)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/solver_suitesparse)
 INSTALL(FILES ${HDRS_SOLVER}
-  DESTINATION include/iri-algorithms/wolf/base/solver)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/solver)
 INSTALL(FILES ${HDRS_SERIALIZATION}
-  DESTINATION include/iri-algorithms/wolf/base/serialization)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/serialization)
 INSTALL(FILES ${HDRS_YAML}
-  DESTINATION include/iri-algorithms/wolf/base/yaml)
+  DESTINATION include/iri-algorithms/wolf/plugin_core/base/yaml)
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/cmake_modules/Findwolf.cmake"
   DESTINATION "lib/cmake/${PROJECT_NAME}")
 
 FILE(WRITE ${PROJECT_NAME}.found "")
 INSTALL(FILES ${PROJECT_NAME}.found
-  DESTINATION include/iri-algorithms/wolf/base)
+  DESTINATION include/iri-algorithms/wolf/plugin_core)
 
 #install Find*.cmake
 configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/wolfConfig.cmake"