diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..638c8d2a4f126823299db9c14b149df08d613908
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+bin
+build
+lib
diff --git a/Findbattery_monitor.cmake b/Findbattery_monitor.cmake
index f6ca8dc2fbb63f40cf8e96571fcdd90899cf4108..f9b3b19834b687ee7b1449145263220ea6697e9a 100755
--- a/Findbattery_monitor.cmake
+++ b/Findbattery_monitor.cmake
@@ -1,9 +1,12 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(battery_monitor_INCLUDE_DIR battery_monitor.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(battery_monitor_INCLUDE_DIR battery_monitor.h /usr/include/iri/battery_monitor /usr/local/include/iri/battery_monitor)
 
 FIND_LIBRARY(battery_monitor_LIBRARY
     NAMES battery_monitor
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib /usr/local/lib /usr/local/lib/iri/battery_monitor)
+    
+SET(battery_monitor_INCLUDE_DIRS ${battery_monitor_INCLUDE_DIR})
+SET(battery_monitor_LIBRARIES    ${battery_monitor_LIBRARY})
 
 IF (battery_monitor_INCLUDE_DIR AND battery_monitor_LIBRARY)
    SET(battery_monitor_FOUND TRUE)
@@ -17,5 +20,4 @@ ELSE (battery_monitor_FOUND)
    IF (battery_monitor_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find battery_monitor")
    ENDIF (battery_monitor_FIND_REQUIRED)
-ENDIF (battery_monitor_FOUND)
-
+ENDIF (battery_monitor_FOUND)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bee69639d9cbd7165d637c64c2d2e91a43258416..2f4fb50c9348230ee47ee7110a2ba7fd3abf9d7c 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,8 +24,8 @@ TARGET_LINK_LIBRARIES(battery_monitor ${dynamixel_LIBRARY})
 # link necessary libraries
 INSTALL(TARGETS battery_monitor
         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 ../Findbattery_monitor.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 ADD_SUBDIRECTORY(examples)