diff --git a/Findusb_i2c_adapter.cmake b/Findusb_i2c_adapter.cmake
index e83fc85f70a2f9d3e0afaac546e821a20c2cf2ac..28b1e57a8c432d46f5753e9e97de17342438ab91 100644
--- a/Findusb_i2c_adapter.cmake
+++ b/Findusb_i2c_adapter.cmake
@@ -1,9 +1,9 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(usb_i2c_adapter_INCLUDE_DIR usb_i2c.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(usb_i2c_adapter_INCLUDE_DIR usb_i2c.h /usr/include/iri/usb_i2c_adapter /usr/local/include/iri/usb_i2c_adapter)
 
 FIND_LIBRARY(usb_i2c_adapter_LIBRARY
     NAMES usb_i2c_adapter
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib/iri/usb_i2c_adapter /usr/local/lib /usr/local/lib/iri/usb_i2c_adapter) 
 
 IF (usb_i2c_adapter_INCLUDE_DIR AND usb_i2c_adapter_LIBRARY)
    SET(usb_i2c_adapter_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b8c85c0d3123d4d3a79fef400c50c1045fddb8f..b87c9106468ed198a309bd6c3392468b8b4a6ab0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,11 +17,11 @@ TARGET_LINK_LIBRARIES(usb_i2c_adapter ${iriutils_LIBRARY} ${comm_LIBRARY})
 
 INSTALL(TARGETS usb_i2c_adapter
   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 ../Findusb_i2c_adapter.cmake DESTINATION ${CMAKE_ROOT}/Modules/)