diff --git a/benchmark/bench_cryptography.cpp b/benchmark/bench_cryptography.cpp
index 84d45cd..9f30a53 100644
--- a/benchmark/bench_cryptography.cpp
+++ b/benchmark/bench_cryptography.cpp
@@ -5,7 +5,7 @@
 
 #include <vector>
 
-#include "ipcl/keygen.hpp"
+#include "ipcl/ipcl.hpp"
 
 #define ADD_SAMPLE_KEY_LENGTH_ARGS Args({1024})->Args({2048})
 #define ADD_SAMPLE_VECTOR_SIZE_ARGS \
diff --git a/benchmark/bench_ops.cpp b/benchmark/bench_ops.cpp
index d57acd3..48fe76c 100644
--- a/benchmark/bench_ops.cpp
+++ b/benchmark/bench_ops.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 #include <vector>
 
-#include "ipcl/keygen.hpp"
+#include "ipcl/ipcl.hpp"
 
 #define ADD_SAMPLE_KEY_LENGTH_ARGS Args({1024})->Args({2048})
 #define ADD_SAMPLE_VECTOR_SIZE_ARGS \
diff --git a/ipcl/CMakeLists.txt b/ipcl/CMakeLists.txt
index b1388b2..7ab34b1 100644
--- a/ipcl/CMakeLists.txt
+++ b/ipcl/CMakeLists.txt
@@ -36,13 +36,13 @@ target_include_directories(ipcl
 )
 
 install(DIRECTORY ${IPCL_INC_DIR}/
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
         FILES_MATCHING
         PATTERN "*.hpp"
         PATTERN "*.h")
 
 install(DIRECTORY ${IPPCRYPTO_INC_DIR}/
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
         FILES_MATCHING
         PATTERN "*.hpp"
         PATTERN "*.h")
@@ -71,14 +71,6 @@ else()
 	set_target_properties(ipcl PROPERTIES OUTPUT_NAME "ipcl")
 endif()
 
-
-install(DIRECTORY ${IPCL_INC_DIR}/
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/
-				FILES_MATCHING
-				PATTERN "*.hpp"
-				PATTERN "*.h"
-)
-
 install(TARGETS ipcl DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 # config cmake config and target file
diff --git a/ipcl/include/ipcl/keygen.hpp b/ipcl/include/ipcl/ipcl.hpp
similarity index 83%
rename from ipcl/include/ipcl/keygen.hpp
rename to ipcl/include/ipcl/ipcl.hpp
index c254db8..f82ad31 100644
--- a/ipcl/include/ipcl/keygen.hpp
+++ b/ipcl/include/ipcl/ipcl.hpp
@@ -1,8 +1,8 @@
-// Copyright (C) 2021 Intel Corporation
+// Copyright (C) 2022 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IPCL_INCLUDE_IPCL_KEYGEN_HPP_
-#define IPCL_INCLUDE_IPCL_KEYGEN_HPP_
+#ifndef IPCL_INCLUDE_IPCL_IPCL_HPP_
+#define IPCL_INCLUDE_IPCL_IPCL_HPP_
 
 #include "ipcl/pri_key.hpp"
 
@@ -34,4 +34,4 @@ BigNumber getPrimeBN(int maxBitSize);
 keyPair generateKeypair(int64_t n_length, bool enable_DJN = true);
 
 }  // namespace ipcl
-#endif  // IPCL_INCLUDE_IPCL_KEYGEN_HPP_
+#endif  // IPCL_INCLUDE_IPCL_IPCL_HPP_
diff --git a/ipcl/keygen.cpp b/ipcl/keygen.cpp
index 290e502..f2d712e 100644
--- a/ipcl/keygen.cpp
+++ b/ipcl/keygen.cpp
@@ -1,11 +1,9 @@
 // Copyright (C) 2021 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-#include "ipcl/keygen.hpp"
-
 #include <vector>
 
-#include "ipcl/util.hpp"
+#include "ipcl/ipcl.hpp"
 
 namespace ipcl {
 
diff --git a/test/test_cryptography.cpp b/test/test_cryptography.cpp
index abe0928..bac47db 100644
--- a/test/test_cryptography.cpp
+++ b/test/test_cryptography.cpp
@@ -7,9 +7,7 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "ipcl/ciphertext.hpp"
-#include "ipcl/keygen.hpp"
-#include "ipcl/plaintext.hpp"
+#include "ipcl/ipcl.hpp"
 
 constexpr int SELF_DEF_NUM_VALUES = 9;
 
diff --git a/test/test_ops.cpp b/test/test_ops.cpp
index 862f1f4..74064fe 100644
--- a/test/test_ops.cpp
+++ b/test/test_ops.cpp
@@ -7,9 +7,7 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "ipcl/ciphertext.hpp"
-#include "ipcl/keygen.hpp"
-#include "ipcl/plaintext.hpp"
+#include "ipcl/ipcl.hpp"
 
 constexpr int SELF_DEF_NUM_VALUES = 7;