diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..10f642450d1a8cd3b40796d29e52f13252a408aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+bin
+build
+lib
+src/xml/*.hxx
+src/xml/*.cxx
diff --git a/Findsegway_head.cmake b/Findsegway_head.cmake
index e25190c14e961c31e44d0a6f111ac74536b7b08f..52452c9c3bb32dc7d5b6d23d26a005ff20843d35 100644
--- a/Findsegway_head.cmake
+++ b/Findsegway_head.cmake
@@ -1,17 +1,20 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(segway_head_INCLUDE_DIR segway_head.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(segway_head_INCLUDE_DIRS segway_head.h /usr/include/iri/segway_head /usr/local/include/iri/segway_head)
 
-FIND_LIBRARY(segway_head_LIBRARY
+FIND_LIBRARY(segway_head_LIBRARIES
     NAMES segway_head
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib /usr/local/lib /usr/local/lib/iri/segway_head)
 
-IF (segway_head_INCLUDE_DIR AND segway_head_LIBRARY)
+SET(segway_head_INCLUDE_DIR ${segway_head_INCLUDE_DIRS})
+SET(segway_head_LIBRARY     ${segway_head_LIBRARIES})
+
+IF (segway_head_INCLUDE_DIRS AND segway_head_LIBRARIES)
    SET(segway_head_FOUND TRUE)
-ENDIF (segway_head_INCLUDE_DIR AND segway_head_LIBRARY)
+ENDIF (segway_head_INCLUDE_DIRS AND segway_head_LIBRARIES)
 
 IF (segway_head_FOUND)
    IF (NOT segway_head_FIND_QUIETLY)
-      MESSAGE(STATUS "Found segway_head: ${segway_head_LIBRARY}")
+      MESSAGE(STATUS "Found segway_head: ${segway_head_LIBRARIES}")
    ENDIF (NOT segway_head_FIND_QUIETLY)
 ELSE (segway_head_FOUND)
    IF (segway_head_FIND_REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fd882d1c46c8746083c3268fa9f99ce157dbc5f..7ff8f401d3c221b8180a9a0c7cd73656064439e8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,11 +26,11 @@ ADD_DEPENDENCIES(segway_head xsd_files_gen)
 
 INSTALL(TARGETS segway_head
   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 ../Findsegway_head.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index d944ccb6bc6b40162918e79af2c960c496ddf787..acb0d120a2ef2125f412de12a80e7d8fa13a7c23 100755
--- 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)