diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c427f228942ca4c051dafd9a36186a9f568c4ca..b04c2cbebf665508f37e04099be13e1ea618f6af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ PROJECT(laser_scan_utils)
 # Paths
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-set(INCLUDE_INSTALL_DIR include/iri-algorithms)
-set(LIB_INSTALL_DIR lib/)
+set(INCLUDE_INSTALL_DIR include)
+set(LIB_INSTALL_DIR lib)
 
 # Build type
 IF (NOT CMAKE_BUILD_TYPE)
@@ -78,38 +78,38 @@ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
 
 #headers
 SET(HDRS_BASE
-    include/laser_scan_utils/laser_scan_utils.h)
+    include/${PROJECT_NAME}/${PROJECT_NAME}.h)
 
 SET(HDRS
-    include/laser_scan_utils/corner_finder.h
-    include/laser_scan_utils/corner_finder_inscribed_angle.h
-    include/laser_scan_utils/corner_point.h
-    include/laser_scan_utils/grid_2d.h
-    include/laser_scan_utils/grid_cluster.h
-    include/laser_scan_utils/laser_scan.h
-    include/laser_scan_utils/laser_scan_with_params.h
-    include/laser_scan_utils/line_finder.h
-    include/laser_scan_utils/line_finder_hough.h
-    include/laser_scan_utils/line_finder_iterative.h
-    include/laser_scan_utils/line_finder_jump_fit.h
-    include/laser_scan_utils/line_segment.h
-    include/laser_scan_utils/point_set.h
-    include/laser_scan_utils/polyline.h
-    include/laser_scan_utils/scan_segment.h
-    include/laser_scan_utils/loop_closure_base.h
-    include/laser_scan_utils/scene_base.h
+    include/${PROJECT_NAME}/corner_finder.h
+    include/${PROJECT_NAME}/corner_finder_inscribed_angle.h
+    include/${PROJECT_NAME}/corner_point.h
+    include/${PROJECT_NAME}/grid_2d.h
+    include/${PROJECT_NAME}/grid_cluster.h
+    include/${PROJECT_NAME}/laser_scan.h
+    include/${PROJECT_NAME}/laser_scan_with_params.h
+    include/${PROJECT_NAME}/line_finder.h
+    include/${PROJECT_NAME}/line_finder_hough.h
+    include/${PROJECT_NAME}/line_finder_iterative.h
+    include/${PROJECT_NAME}/line_finder_jump_fit.h
+    include/${PROJECT_NAME}/line_segment.h
+    include/${PROJECT_NAME}/point_set.h
+    include/${PROJECT_NAME}/polyline.h
+    include/${PROJECT_NAME}/scan_segment.h
+    include/${PROJECT_NAME}/loop_closure_base.h
+    include/${PROJECT_NAME}/scene_base.h
     )
   IF(csm_FOUND)
     SET(HDRS ${HDRS}
-      include/laser_scan_utils/icp.h)
+      include/${PROJECT_NAME}/icp.h)
   ENDIF(csm_FOUND)
 
   IF(falkolib_FOUND)
     SET(HDRS ${HDRS}
-      include/laser_scan_utils/corner_falko_2d.h
-      include/laser_scan_utils/loop_closure_falko.h
-      include/laser_scan_utils/scene_falko.h
-      include/laser_scan_utils/match_loop_closure_scene.h)
+      include/${PROJECT_NAME}/corner_falko_2d.h
+      include/${PROJECT_NAME}/loop_closure_falko.h
+      include/${PROJECT_NAME}/scene_falko.h
+      include/${PROJECT_NAME}/match_loop_closure_scene.h)
   ENDIF(falkolib_FOUND)
 
 #sources