diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 48fb6b9..d5dc42f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,4 +7,4 @@ if(ENABLE_hdf5)
   add_subdirectory(opt/hdf5)
 endif()
 
-install(DIRECTORY include/ DESTINATION ${INSTALL_PATH}/include)
+install(DIRECTORY include/ DESTINATION ${INSTALL_PATH}/include/cnorxz)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index f405cfc..850022c 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -26,9 +26,7 @@ set_target_properties(cnorxz PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 #  )
 #set_target_properties(cnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 
-install(TARGETS cnorxz
-  ARCHIVE DESTINATION ${INSTALL_PATH}/lib
-  LIBRARY DESTINATION ${INSTALL_PATH}/lib)
+install(TARGETS cnorxz LIBRARY DESTINATION ${INSTALL_PATH}/lib)
 
 #install(TARGETS cnorxz_static
 #  ARCHIVE DESTINATION ${INSTALL_PATH}/lib
diff --git a/src/opt/hdf5/CMakeLists.txt b/src/opt/hdf5/CMakeLists.txt
index 6d6593d..b0f1a98 100644
--- a/src/opt/hdf5/CMakeLists.txt
+++ b/src/opt/hdf5/CMakeLists.txt
@@ -13,5 +13,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_subdirectory(lib)
 add_subdirectory(tests)
 
-set(HDF5_INSTALL_PATH ${INSTALL_PATH}/hdf5)
-install(DIRECTORY include/ DESTINATION ${HDF5_INSTALL_PATH}/include)
+install(DIRECTORY include/ DESTINATION ${INSTALL_PATH}/include/cnorxz/hdf5)
diff --git a/src/opt/hdf5/lib/CMakeLists.txt b/src/opt/hdf5/lib/CMakeLists.txt
index 651cd17..fffa785 100644
--- a/src/opt/hdf5/lib/CMakeLists.txt
+++ b/src/opt/hdf5/lib/CMakeLists.txt
@@ -16,7 +16,4 @@ add_library(cnorxzhdf5 SHARED
   )
 set_target_properties(cnorxzhdf5 PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 
-install(TARGETS cnorxz
-  ARCHIVE DESTINATION ${HDF5_INSTALL_PATH}/lib
-  LIBRARY DESTINATION ${HDF5_INSTALL_PATH}/lib
-  )
+install(TARGETS cnorxzhdf5 LIBRARY DESTINATION ${INSTALL_PATH}/lib)