diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c4eacec4547808ce5bf3b11d42b3dbf155a9270..5c48da8725a57fefa0538e16d60e312faa9b1658 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,7 @@ ENDIF(GLOG_FOUND)
 #HEADERS
 
 SET(HDRS_BASE
+  include/base/SE3.h
   include/base/diff_drive_tools.h
   include/base/diff_drive_tools.hpp
   include/base/eigen_assert.h
@@ -250,7 +251,6 @@ SET(HDRS_BASE
   include/base/state_block.h
   include/base/state_homogeneous_3D.h
   include/base/state_quaternion.h
-  include/base/SE3.h
   include/base/time_stamp.h
   include/base/track_matrix.h
   include/base/trajectory_base.h
@@ -259,98 +259,71 @@ SET(HDRS_BASE
 SET(HDRS_CAPTURE
   include/base/capture/capture_base.h
   include/base/capture/capture_buffer.h
-  include/base/capture/capture_pose.h
-  include/base/capture/capture_void.h
   include/base/capture/capture_motion.h
   include/base/capture/capture_odom_2D.h
   include/base/capture/capture_odom_3D.h
-  include/base/capture/capture_odom_2D.h
-  include/base/capture/capture_odom_3D.h
+  include/base/capture/capture_pose.h
   include/base/capture/capture_velocity.h
+  include/base/capture/capture_void.h
   include/base/capture/capture_wheel_joint_position.h
   )
 SET(HDRS_FACTOR
+  include/base/factor/factor_analytic.h
+  include/base/factor/factor_autodiff.h
+  include/base/factor/factor_autodiff_distance_3d.h
+  include/base/factor/factor_base.h
   include/base/factor/factor_block_absolute.h
   include/base/factor/factor_container.h
-  include/base/factor/factor_corner_2D.h
-  include/base/factor/factor_epipolar.h
-  include/base/factor/factor_fix_bias.h
-  include/base/factor/factor_odom_2D.h
-  include/base/factor/factor_odom_2D_analytic.h
-  include/base/factor/factor_odom_3D.h
-  include/base/factor/factor_pose_2D.h
-  include/base/factor/factor_pose_3D.h
-  include/base/factor/factor_quaternion_absolute.h
-  include/base/factor/factor_relative_2D_analytic.h
-  include/base/factor/factor_autodiff_distance_3D.h
-  include/base/factor/factor_block_absolute.h
-  include/base/factor/factor_container.h
-  include/base/factor/factor_corner_2D.h
+  include/base/factor/factor_corner_2d.h
   include/base/factor/factor_diff_drive.h
   include/base/factor/factor_epipolar.h
   include/base/factor/factor_fix_bias.h
-  include/base/factor/factor_odom_2D.h
-  include/base/factor/factor_odom_2D_analytic.h
-  include/base/factor/factor_odom_3D.h
-  include/base/factor/factor_pose_2D.h
-  include/base/factor/factor_pose_3D.h
+  include/base/factor/factor_odom_2d.h
+  include/base/factor/factor_odom_2d_analytic.h
+  include/base/factor/factor_odom_3d.h
+  include/base/factor/factor_pose_2d.h
+  include/base/factor/factor_pose_3d.h
   include/base/factor/factor_quaternion_absolute.h
-  include/base/factor/factor_relative_2D_analytic.h
-  include/base/factor/factor_analytic.h
-  include/base/factor/factor_autodiff.h
-  include/base/factor/factor_base.h
+  include/base/factor/factor_relative_2d_analytic.h
   )
 SET(HDRS_FEATURE
-  include/base/feature/feature_corner_2D.h
-  include/base/feature/feature_odom_2D.h
+  include/base/feature/feature_base.h
   include/base/feature/feature_corner_2D.h
   include/base/feature/feature_diff_drive.h
-  include/base/feature/feature_odom_2D.h
-  include/base/feature/feature_base.h
   include/base/feature/feature_match.h
+  include/base/feature/feature_odom_2D.h
   include/base/feature/feature_pose.h
   )
 SET(HDRS_LANDMARK
   include/base/landmark/landmark_base.h
-  include/base/landmark/landmark_match.h
-  include/base/landmark/landmark_corner_2D.h
   include/base/landmark/landmark_container.h
-  include/base/landmark/landmark_line_2D.h
   include/base/landmark/landmark_corner_2D.h
-  include/base/landmark/landmark_container.h
   include/base/landmark/landmark_line_2D.h
+  include/base/landmark/landmark_match.h
   )
 SET(HDRS_PROCESSOR
+  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_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_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_landmark.h
   include/base/processor/processor_tracker_landmark_dummy.h
-  include/base/processor/processor_frame_nearest_neighbor_filter.h
-  include/base/processor/processor_odom_2D.h
-  include/base/processor/processor_odom_3D.h
-  include/base/processor/processor_tracker_feature_dummy.h
-  include/base/processor/processor_tracker_landmark_dummy.h
-  include/base/processor/processor_factory.h
-  include/base/processor/processor_logging.h
-  include/base/processor/processor_base.h
-  include/base/processor/processor_factory.h
-  include/base/processor/processor_loopclosure_base.h
-  include/base/processor/processor_motion.h
-  include/base/processor/processor_tracker_feature.h
-  include/base/processor/processor_tracker.h
   )
 SET(HDRS_SENSOR
   include/base/sensor/sensor_base.h
   include/base/sensor/sensor_diff_drive.h
+  include/base/sensor/sensor_factory.h
   include/base/sensor/sensor_odom_2D.h
   include/base/sensor/sensor_odom_3D.h
-  include/base/sensor/sensor_odom_2D.h
-  include/base/sensor/sensor_odom_3D.h
-  include/base/sensor/sensor_factory.h
   )
 SET(HDRS_SOLVER
   include/base/solver/solver_manager.h
@@ -358,14 +331,15 @@ SET(HDRS_SOLVER
 # [Add generic derived header before this line]
 
 SET(HDRS_DTASSC
-  include/base/track_matrix.h
-  include/base/association/association_solver.h
+  include/base/association/association_nnls.h
   include/base/association/association_node.h
+  include/base/association/association_solver.h
   include/base/association/association_tree.h
-  include/base/association/association_nnls.h
+  include/base/track_matrix.h
   )
 
 SET(HDRS_CORE 
+  include/base/SE3.h
   include/base/capture/capture_base.h
   include/base/capture/capture_buffer.h
   include/base/capture/capture_pose.h
@@ -373,7 +347,6 @@ SET(HDRS_CORE
   include/base/factor/factor_analytic.h
   include/base/factor/factor_autodiff.h
   include/base/factor/factor_base.h
-  include/base/processor/processor_factory.h
   include/base/feature/feature_base.h
   include/base/feature/feature_match.h
   include/base/feature/feature_pose.h
@@ -384,25 +357,24 @@ SET(HDRS_CORE
   include/base/local_parametrization_base.h
   include/base/local_parametrization_homogeneous.h
   include/base/local_parametrization_quaternion.h
-  include/base/processor/processor_logging.h
   include/base/map_base.h
   include/base/motion_buffer.h
   include/base/node_base.h
   include/base/problem.h
   include/base/processor/processor_base.h
+  include/base/processor/processor_factory.h
+  include/base/processor/processor_logging.h
   include/base/processor/processor_loopclosure_base.h
   include/base/processor/processor_motion.h
-  include/base/processor/processor_tracker_feature.h
   include/base/processor/processor_tracker.h
+  include/base/processor/processor_tracker_feature.h
   include/base/rotations.h
   include/base/sensor/sensor_base.h
-  include/base/processor/processor_factory.h
   include/base/singleton.h
   include/base/state_angle.h
   include/base/state_block.h
   include/base/state_homogeneous_3D.h
   include/base/state_quaternion.h
-  include/base/SE3.h
   include/base/time_stamp.h
   include/base/track_matrix.h
   include/base/trajectory_base.h
@@ -442,7 +414,6 @@ SET(SRCS_CORE
 SET(SRCS_BASE
   src/capture/capture_motion.cpp
   src/processor/processor_capture_holder.cpp
-  # examples/test_processor_tracker_landmark.cpp
   )
 
 SET(SRCS
@@ -459,19 +430,19 @@ SET(SRCS_FEATURE
   src/feature/feature_odom_2D.cpp
   )
 SET(SRCS_LANDMARK
-  src/landmark/landmark_corner_2D.cpp
   src/landmark/landmark_container.cpp
+  src/landmark/landmark_corner_2D.cpp
   src/landmark/landmark_line_2D.cpp
   )
 SET(SRCS_PROCESSOR
-  src/processor/processor_frame_nearest_neighbor_filter.cpp
   src/processor/processor_diff_drive.cpp
+  src/processor/processor_frame_nearest_neighbor_filter.cpp
   src/processor/processor_odom_2D.cpp
   src/processor/processor_odom_3D.cpp
   src/processor/processor_tracker_feature.cpp
   src/processor/processor_tracker_feature_dummy.cpp
-  src/processor/processor_tracker_landmark_dummy.cpp
   src/processor/processor_tracker_landmark.cpp
+  src/processor/processor_tracker_landmark_dummy.cpp
   )
 SET(SRCS_SENSOR
   src/sensor/sensor_diff_drive.cpp
@@ -479,10 +450,10 @@ SET(SRCS_SENSOR
   src/sensor/sensor_odom_3D.cpp
   )
 SET(SRCS_DTASSC
-  src/association/association_solver.cpp
+  src/association/association_nnls.cpp
   src/association/association_node.cpp
+  src/association/association_solver.cpp
   src/association/association_tree.cpp
-  src/association/association_nnls.cpp
   )
 SET(SRCS_SOLVER
   src/solver/solver_manager.cpp
@@ -491,19 +462,19 @@ SET(SRCS_SOLVER
 #optional HDRS and SRCS
 IF (Ceres_FOUND)
     SET(HDRS_WRAPPER
-      include/base/solver_suitesparse/sparse_utils.h
-      include/base/solver/solver_manager.h
-      include/base/ceres_wrapper/ceres_manager.h
       #ceres_wrapper/qr_manager.h
+      include/base/ceres_wrapper/ceres_manager.h
       include/base/ceres_wrapper/cost_function_wrapper.h
       include/base/ceres_wrapper/create_numeric_diff_cost_function.h
       include/base/ceres_wrapper/local_parametrization_wrapper.h 
+      include/base/solver/solver_manager.h
+      include/base/solver_suitesparse/sparse_utils.h
       )
     SET(SRCS_WRAPPER
-      src/solver/solver_manager.cpp
-      src/ceres_wrapper/ceres_manager.cpp
       #ceres_wrapper/qr_manager.cpp
+      src/ceres_wrapper/ceres_manager.cpp
       src/ceres_wrapper/local_parametrization_wrapper.cpp 
+      src/solver/solver_manager.cpp
       )
 ELSE(Ceres_FOUND)
   SET(HDRS_WRAPPER)