diff --git a/Findlib_template.cmake b/Findlib_template.cmake
index 7b5fefb25ae85d2c511984d7b29de532497c91aa..91b373b3cc5f60881e71d3c09e8a0b0db636b71f 100755
--- a/Findlib_template.cmake
+++ b/Findlib_template.cmake
@@ -1,17 +1,20 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(library_name_INCLUDE_DIR header_file /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(library_name_INCLUDE_DIRS header_file /usr/include/iri/library_name /usr/local/include/iri/library_name)
 
-FIND_LIBRARY(library_name_LIBRARY
+FIND_LIBRARY(library_name_LIBRARIES
     NAMES library_name
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib /usr/lib/iri/library_name /usr/local/lib /usr/local/lib/iri/library_name)
 
-IF (library_name_INCLUDE_DIR AND library_name_LIBRARY)
+SET(library_name_INCLUDE_DIR ${library_name_INCLUDE_DIRS})
+SET(library_name_LIBRARY     ${library_name_LIBRARIES})
+
+IF (library_name_INCLUDE_DIRS AND library_name_LIBRARIES)
    SET(library_name_FOUND TRUE)
-ENDIF (library_name_INCLUDE_DIR AND library_name_LIBRARY)
+ENDIF (library_name_INCLUDE_DIRS AND library_name_LIBRARIES)
 
 IF (library_name_FOUND)
    IF (NOT library_name_FIND_QUIETLY)
-      MESSAGE(STATUS "Found library_name: ${library_name_LIBRARY}")
+      MESSAGE(STATUS "Found library_name: ${library_name_LIBRARIES}")
    ENDIF (NOT library_name_FIND_QUIETLY)
 ELSE (library_name_FOUND)
    IF (library_name_FIND_REQUIRED)
diff --git a/ReadMe_template.md b/ReadMe_template.md
index 800bac779a56f2ad7e77ab79ff5cfb57780aedb1..f745621462eb78ab001c010ee31821a70ed4d1f9 100755
--- a/ReadMe_template.md
+++ b/ReadMe_template.md
@@ -68,11 +68,11 @@ To use this library in an other library or application, in the CMakeLists.txt fi
 
 In the case that the package is present, it is necessary to add the header files directory to the include directory path by using
 
-``` INCLUDE_DIRECTORIES(${project_name_INCLUDE_DIR}) ```
+``` INCLUDE_DIRECTORIES(${project_name_INCLUDE_DIRS}) ```
 
 and it is also necessary to link with the desired libraries by using the following command
 
-``` TARGET_LINK_LIBRARIES(<executable name> ${project_name_LIBRARY}) ```
+``` TARGET_LINK_LIBRARIES(<executable name> ${project_name_LIBRARIES}) ```
 
 ## Disclaimer  
 
diff --git a/new_project.sh b/new_project.sh
index 0238dd7892a43908972479f1f1d26596d76f5b50..dfba67b45663b0650e56aeaaf4b79513d718e800 100755
--- a/new_project.sh
+++ b/new_project.sh
@@ -160,7 +160,8 @@ rm tmp3.md
 rm ReadMe_template.md
 
 #Set the project name on the CMakeLists.txt script file
-NEW_NAME=$(echo $NAME | sed 's/_/-/g')
+#NEW_NAME=$(echo $NAME | sed 's/_/-/g')
+NEW_NAME=$NAME
 if [ $TEST = 1 ]
 then
   sed 's/project_name/'$NEW_NAME'/g' <CMakeLists_test_template.txt >./CMakeLists.txt
@@ -227,9 +228,9 @@ else
   done
   echo "INSTALL(TARGETS $NAME" >> CMakeLists.tmp
   echo "        RUNTIME DESTINATION bin" >> CMakeLists.tmp
-  echo "        LIBRARY DESTINATION lib/iridrivers" >> CMakeLists.tmp
-  echo "        ARCHIVE DESTINATION lib/iridrivers)" >> CMakeLists.tmp
-  echo "INSTALL(FILES "'${'"headers"'}' "DESTINATION include/iridrivers)" >> CMakeLists.tmp
+  echo "        LIBRARY DESTINATION lib/iri/${NAME}" >> CMakeLists.tmp
+  echo "        ARCHIVE DESTINATION lib/iri/${NAME})" >> CMakeLists.tmp
+  echo "INSTALL(FILES "'${'"headers"'}' "DESTINATION include/iri/${NAME})" >> CMakeLists.tmp
   echo "INSTALL(FILES ../Find$NAME.cmake DESTINATION "'${'"CMAKE_ROOT"'}'"/Modules/)" >> CMakeLists.tmp
   echo "ADD_SUBDIRECTORY(examples)" >> CMakeLists.tmp
   mv CMakeLists.tmp ./src/CMakeLists.txt
@@ -281,6 +282,5 @@ rm driver_src_template.cpp
 rm driver_header_template.h
 rm driver_example_src_template.cpp
 rm Findlib_template.cmake
-rm template.tar.gz
 rm new_project.sh
 rm -rf .git
diff --git a/template.tar.gz b/template.tar.gz
deleted file mode 100755
index f1ad7d0bf7012d32d1c527a67767709b319c1c56..0000000000000000000000000000000000000000
Binary files a/template.tar.gz and /dev/null differ