diff --git a/Findptu_d46.cmake b/Findptu_d46.cmake
index b682c224dbc09f9fc93395557ccbe6450a38e3a4..be62e874be87ed576c1a7fa666bc08d2dee9d734 100755
--- a/Findptu_d46.cmake
+++ b/Findptu_d46.cmake
@@ -1,9 +1,9 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(ptu_d46_INCLUDE_DIR ptu_commands.h ptu_d46.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(ptu_d46_INCLUDE_DIR ptu_commands.h ptu_d46.h /usr/include/iri/ptu_d46 /usr/local/include/iri/ptu_d46)
 
 FIND_LIBRARY(ptu_d46_LIBRARY
     NAMES ptu_d46
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib/iri/ptu_d46 /usr/local/lib /usr/local/lib/iri/ptu_d46) 
 
 IF (ptu_d46_INCLUDE_DIR AND ptu_d46_LIBRARY)
    SET(ptu_d46_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f168741b7d2ece7936942a2bb3b5c6285e41b8d..23006c2b828dbd6e5d2d5acfddbfbd2f534b905b 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,11 +30,11 @@ TARGET_LINK_LIBRARIES(ptu_d46 ${trajectory_LIBRARY})
 
 INSTALL(TARGETS ptu_d46
   RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib/iridrivers
-  ARCHIVE DESTINATION lib/iridrivers
+  LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+  ARCHIVE DESTINATION lib/iri/${PROJECT_NAME}
 )
 
-INSTALL(FILES ${headers} DESTINATION include/iridrivers)
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
 
 INSTALL(FILES ../Findptu_d46.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 20a3d78fb33b7b7520077b01e66c0e479f0a7c5d..a98246a880a2f52506f429a4b3289d45d94fb5b4 100755
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -39,8 +39,8 @@ IF(XSD_FOUND)
          DEPENDS ${XSD_PATH_FILES}
          COMMENT "Parsing the xml template file ${XSD_FILES}")
 
-      INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iridrivers/xml)
-      INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iridrivers/xml)
+      INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iri/${PROJECT_NAME}/xml)
+      INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iri/${PROJECT_NAME}/xml)
    ENDIF(XSD_FILES)
 ENDIF(XSD_FOUND)