diff --git a/Findtrajectory.cmake b/Findtrajectory.cmake
index 71343fae41320e4616b10ad7817d32a2d5ae7276..23bcb87b0161e06df1ef7279e491dfd8db8c8fdd 100644
--- a/Findtrajectory.cmake
+++ b/Findtrajectory.cmake
@@ -1,9 +1,9 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(trajectory_INCLUDE_DIR trajectory.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(trajectory_INCLUDE_DIR trajectory.h /usr/include/iri/trajectory /usr/local/include/iri/trajectory)
 
 FIND_LIBRARY(trajectory_LIBRARY
     NAMES trajectory
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib/iri/trajectory /usr/local/lib /usr/local/lib/iri/trajectory) 
 
 IF (trajectory_INCLUDE_DIR AND trajectory_LIBRARY)
    SET(trajectory_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29e465920bbdd375dcaee995f820c252b8d82926..be93c4e9b2eeb8dd974e16768325f629804f61aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,8 +23,8 @@ ADD_DEPENDENCIES(trajectory xsd_files_gen)
 
 INSTALL(TARGETS trajectory
         RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib/iridrivers
-        ARCHIVE DESTINATION lib/iridrivers)
-INSTALL(FILES ${headers} DESTINATION include/iridrivers)
+        LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+        ARCHIVE DESTINATION lib/iri/${PROJECT_NAME})
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
 INSTALL(FILES ../Findtrajectory.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 ADD_SUBDIRECTORY(examples)
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 49639f08caf9258271ea3d082b8ab310f7b2e0cd..e571ce2aeebfcf21e84d8c2637563e9cf1ff5827 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -39,7 +39,7 @@ 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)