diff --git a/.gitignore b/.gitignore
index 8d31869..c3d0974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@
 /aminclude_static.am
 /m4
 /tool/pldmtool
-pldmd
 
 # Code Coverage
 *.gcda
diff --git a/bios_utils.hpp b/common/bios_utils.hpp
similarity index 100%
rename from bios_utils.hpp
rename to common/bios_utils.hpp
diff --git a/types.hpp b/common/types.hpp
similarity index 100%
rename from types.hpp
rename to common/types.hpp
diff --git a/utils.cpp b/common/utils.cpp
similarity index 100%
rename from utils.cpp
rename to common/utils.cpp
diff --git a/utils.hpp b/common/utils.hpp
similarity index 100%
rename from utils.hpp
rename to common/utils.hpp
diff --git a/host-bmc/dbus_to_host_effecters.hpp b/host-bmc/dbus_to_host_effecters.hpp
index 7720edd..d024ed6 100644
--- a/host-bmc/dbus_to_host_effecters.hpp
+++ b/host-bmc/dbus_to_host_effecters.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "common/types.hpp"
+#include "common/utils.hpp"
 #include "pldmd/dbus_impl_requester.hpp"
-#include "types.hpp"
-#include "utils.hpp"
 
 #include <string>
 #include <utility>
diff --git a/host-bmc/host_pdr_handler.hpp b/host-bmc/host_pdr_handler.hpp
index 06b46e6..a54c008 100644
--- a/host-bmc/host_pdr_handler.hpp
+++ b/host-bmc/host_pdr_handler.hpp
@@ -3,10 +3,10 @@
 #include "libpldm/base.h"
 #include "libpldm/platform.h"
 
+#include "common/types.hpp"
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
 #include "pldmd/dbus_impl_requester.hpp"
-#include "types.hpp"
-#include "utils.hpp"
 
 #include <sdeventplus/event.hpp>
 #include <sdeventplus/source/event.hpp>
diff --git a/libpldmresponder/bios.cpp b/libpldmresponder/bios.cpp
index 1819030..4bfef06 100644
--- a/libpldmresponder/bios.cpp
+++ b/libpldmresponder/bios.cpp
@@ -1,6 +1,6 @@
 #include "bios.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <time.h>
 
diff --git a/libpldmresponder/bios_attribute.cpp b/libpldmresponder/bios_attribute.cpp
index f6b3912..b0b834e 100644
--- a/libpldmresponder/bios_attribute.cpp
+++ b/libpldmresponder/bios_attribute.cpp
@@ -3,7 +3,7 @@
 #include "bios_attribute.hpp"
 
 #include "bios_config.hpp"
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <iostream>
 #include <variant>
diff --git a/libpldmresponder/bios_attribute.hpp b/libpldmresponder/bios_attribute.hpp
index effc733..7b4116a 100644
--- a/libpldmresponder/bios_attribute.hpp
+++ b/libpldmresponder/bios_attribute.hpp
@@ -3,7 +3,7 @@
 #include "bios_table.h"
 
 #include "bios_table.hpp"
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/libpldmresponder/bios_enum_attribute.cpp b/libpldmresponder/bios_enum_attribute.cpp
index 2f7da62..ecbb8f5 100644
--- a/libpldmresponder/bios_enum_attribute.cpp
+++ b/libpldmresponder/bios_enum_attribute.cpp
@@ -2,7 +2,7 @@
 
 #include "bios_enum_attribute.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <iostream>
 
diff --git a/libpldmresponder/bios_integer_attribute.cpp b/libpldmresponder/bios_integer_attribute.cpp
index 1aae60a..23ffab3 100644
--- a/libpldmresponder/bios_integer_attribute.cpp
+++ b/libpldmresponder/bios_integer_attribute.cpp
@@ -1,6 +1,6 @@
 #include "bios_integer_attribute.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 namespace pldm
 {
diff --git a/libpldmresponder/bios_string_attribute.cpp b/libpldmresponder/bios_string_attribute.cpp
index 1b6ba75..1453644 100644
--- a/libpldmresponder/bios_string_attribute.cpp
+++ b/libpldmresponder/bios_string_attribute.cpp
@@ -1,6 +1,6 @@
 #include "bios_string_attribute.hpp"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <iostream>
 #include <tuple>
diff --git a/libpldmresponder/event_parser.hpp b/libpldmresponder/event_parser.hpp
index 19004a7..49f2233 100644
--- a/libpldmresponder/event_parser.hpp
+++ b/libpldmresponder/event_parser.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "types.hpp"
-#include "utils.hpp"
+#include "common/types.hpp"
+#include "common/utils.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/libpldmresponder/fru.cpp b/libpldmresponder/fru.cpp
index b3dc73b..a9c8787 100644
--- a/libpldmresponder/fru.cpp
+++ b/libpldmresponder/fru.cpp
@@ -2,7 +2,7 @@
 
 #include "libpldm/utils.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <systemd/sd-journal.h>
 
diff --git a/libpldmresponder/pdr.hpp b/libpldmresponder/pdr.hpp
index a2a066f..c6f05a2 100644
--- a/libpldmresponder/pdr.hpp
+++ b/libpldmresponder/pdr.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
-#include "utils.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/pdr_utils.hpp b/libpldmresponder/pdr_utils.hpp
index e644534..2843ee6 100644
--- a/libpldmresponder/pdr_utils.hpp
+++ b/libpldmresponder/pdr_utils.hpp
@@ -2,8 +2,8 @@
 
 #include "libpldm/pdr.h"
 
-#include "types.hpp"
-#include "utils.hpp"
+#include "common/types.hpp"
+#include "common/utils.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/platform.cpp b/libpldmresponder/platform.cpp
index 569977a..1e13754 100644
--- a/libpldmresponder/platform.cpp
+++ b/libpldmresponder/platform.cpp
@@ -1,12 +1,12 @@
 
 #include "platform.hpp"
 
+#include "common/utils.hpp"
 #include "event_parser.hpp"
 #include "pdr_numeric_effecter.hpp"
 #include "pdr_state_effecter.hpp"
 #include "platform_numeric_effecter.hpp"
 #include "platform_state_effecter.hpp"
-#include "utils.hpp"
 
 namespace pldm
 {
diff --git a/libpldmresponder/platform.hpp b/libpldmresponder/platform.hpp
index a52c9a8..40f9214 100644
--- a/libpldmresponder/platform.hpp
+++ b/libpldmresponder/platform.hpp
@@ -5,12 +5,12 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
+#include "common/utils.hpp"
 #include "event_parser.hpp"
 #include "host-bmc/host_pdr_handler.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <stdint.h>
 
diff --git a/libpldmresponder/platform_numeric_effecter.hpp b/libpldmresponder/platform_numeric_effecter.hpp
index 9d435b1..62228e0 100644
--- a/libpldmresponder/platform_numeric_effecter.hpp
+++ b/libpldmresponder/platform_numeric_effecter.hpp
@@ -5,10 +5,10 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "pdr_utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <math.h>
 #include <stdint.h>
diff --git a/libpldmresponder/platform_state_effecter.hpp b/libpldmresponder/platform_state_effecter.hpp
index 961aa7f..ba1c9bd 100644
--- a/libpldmresponder/platform_state_effecter.hpp
+++ b/libpldmresponder/platform_state_effecter.hpp
@@ -5,10 +5,10 @@
 #include "libpldm/platform.h"
 #include "libpldm/states.h"
 
+#include "common/utils.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "pdr_utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <cstdint>
 #include <map>
diff --git a/meson.build b/meson.build
index 83b4c22..ba84462 100644
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,7 @@
 libpldmutils_headers = ['.']
 libpldmutils = library(
   'pldmutils',
-  'utils.cpp',
+  'common/utils.cpp',
   version: meson.project_version(),
   dependencies: [
       libpldm,
diff --git a/oem/ibm/libpldmresponder/file_io.cpp b/oem/ibm/libpldmresponder/file_io.cpp
index b05a525..d0595e3 100644
--- a/oem/ibm/libpldmresponder/file_io.cpp
+++ b/oem/ibm/libpldmresponder/file_io.cpp
@@ -4,9 +4,9 @@
 
 #include "libpldm/base.h"
 
+#include "common/utils.hpp"
 #include "file_io_by_type.hpp"
 #include "file_table.hpp"
-#include "utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <fcntl.h>
diff --git a/oem/ibm/libpldmresponder/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index e1f26cb..aba70ba 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -6,8 +6,8 @@
 #include "oem/ibm/libpldm/file_io.h"
 #include "oem/ibm/libpldm/host.h"
 
+#include "common/utils.hpp"
 #include "pldmd/handler.hpp"
-#include "utils.hpp"
 
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/oem/ibm/libpldmresponder/file_io_by_type.cpp b/oem/ibm/libpldmresponder/file_io_by_type.cpp
index 36f5f6c..d6367ba 100644
--- a/oem/ibm/libpldmresponder/file_io_by_type.cpp
+++ b/oem/ibm/libpldmresponder/file_io_by_type.cpp
@@ -5,11 +5,11 @@
 #include "libpldm/base.h"
 #include "oem/ibm/libpldm/file_io.h"
 
+#include "common/utils.hpp"
 #include "file_io_type_cert.hpp"
 #include "file_io_type_dump.hpp"
 #include "file_io_type_lid.hpp"
 #include "file_io_type_pel.hpp"
-#include "utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <stdint.h>
diff --git a/oem/ibm/libpldmresponder/file_io_type_cert.cpp b/oem/ibm/libpldmresponder/file_io_type_cert.cpp
index 82aecbf..f78dbf1 100644
--- a/oem/ibm/libpldmresponder/file_io_type_cert.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_cert.cpp
@@ -3,7 +3,7 @@
 #include "libpldm/base.h"
 #include "oem/ibm/libpldm/file_io.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <stdint.h>
 
diff --git a/oem/ibm/libpldmresponder/file_io_type_dump.cpp b/oem/ibm/libpldmresponder/file_io_type_dump.cpp
index 188fc4a..a99deca 100644
--- a/oem/ibm/libpldmresponder/file_io_type_dump.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_dump.cpp
@@ -3,7 +3,7 @@
 #include "libpldm/base.h"
 #include "oem/ibm/libpldm/file_io.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <stdint.h>
diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.cpp b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
index ef21c01..aaff222 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
@@ -5,7 +5,7 @@
 #include "libpldm/base.h"
 #include "oem/ibm/libpldm/file_io.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <stdint.h>
diff --git a/pldmd/dbus_impl_pdr.cpp b/pldmd/dbus_impl_pdr.cpp
index 804a360..06e3cdd 100644
--- a/pldmd/dbus_impl_pdr.cpp
+++ b/pldmd/dbus_impl_pdr.cpp
@@ -3,7 +3,7 @@
 #include "libpldm/pdr.h"
 #include "libpldm/pldm_types.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <iostream>
diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
index ed7e80e..b2912bc 100644
--- a/pldmd/pldmd.cpp
+++ b/pldmd/pldmd.cpp
@@ -3,6 +3,7 @@
 #include "libpldm/pdr.h"
 #include "libpldm/platform.h"
 
+#include "common/utils.hpp"
 #include "dbus_impl_pdr.hpp"
 #include "dbus_impl_requester.hpp"
 #include "host-bmc/dbus_to_host_effecters.hpp"
@@ -12,7 +13,6 @@
 #include "libpldmresponder/bios.hpp"
 #include "libpldmresponder/fru.hpp"
 #include "libpldmresponder/platform.hpp"
-#include "utils.hpp"
 
 #include <err.h>
 #include <getopt.h>
diff --git a/test/libpldmresponder_bios_config_test.cpp b/test/libpldmresponder_bios_config_test.cpp
index 371658c..e0025fd 100644
--- a/test/libpldmresponder_bios_config_test.cpp
+++ b/test/libpldmresponder_bios_config_test.cpp
@@ -1,4 +1,4 @@
-#include "bios_utils.hpp"
+#include "common/bios_utils.hpp"
 #include "libpldmresponder/bios_config.hpp"
 #include "libpldmresponder/bios_string_attribute.hpp"
 #include "mocked_bios.hpp"
diff --git a/test/libpldmresponder_dbus_to_host_effecter_test.cpp b/test/libpldmresponder_dbus_to_host_effecter_test.cpp
index 56b62e9..0cc963a 100644
--- a/test/libpldmresponder_dbus_to_host_effecter_test.cpp
+++ b/test/libpldmresponder_dbus_to_host_effecter_test.cpp
@@ -1,6 +1,6 @@
+#include "common/utils.hpp"
 #include "host-bmc/dbus_to_host_effecters.hpp"
 #include "mocked_utils.hpp"
-#include "utils.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/test/libpldmresponder_platform_test.cpp b/test/libpldmresponder_platform_test.cpp
index f487d3b..fdb5544 100644
--- a/test/libpldmresponder_platform_test.cpp
+++ b/test/libpldmresponder_platform_test.cpp
@@ -1,3 +1,4 @@
+#include "common/utils.hpp"
 #include "libpldmresponder/event_parser.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
@@ -5,7 +6,6 @@
 #include "libpldmresponder/platform_numeric_effecter.hpp"
 #include "libpldmresponder/platform_state_effecter.hpp"
 #include "mocked_utils.hpp"
-#include "utils.hpp"
 
 #include <iostream>
 
diff --git a/test/mocked_utils.hpp b/test/mocked_utils.hpp
index 0813830..838e542 100644
--- a/test/mocked_utils.hpp
+++ b/test/mocked_utils.hpp
@@ -1,4 +1,4 @@
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/test/pldm_utils_test.cpp b/test/pldm_utils_test.cpp
index c9c5dd8..a65b33b 100644
--- a/test/pldm_utils_test.cpp
+++ b/test/pldm_utils_test.cpp
@@ -1,6 +1,6 @@
 #include "libpldm/platform.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/tool/pldm_bios_cmd.cpp b/tool/pldm_bios_cmd.cpp
index 3e554b1..ba40dea 100644
--- a/tool/pldm_bios_cmd.cpp
+++ b/tool/pldm_bios_cmd.cpp
@@ -3,9 +3,9 @@
 #include "libpldm/bios_table.h"
 #include "libpldm/utils.h"
 
-#include "bios_utils.hpp"
+#include "common/bios_utils.hpp"
+#include "common/utils.hpp"
 #include "pldm_cmd_helper.hpp"
-#include "utils.hpp"
 
 #include <map>
 #include <optional>
diff --git a/tool/pldm_cmd_helper.hpp b/tool/pldm_cmd_helper.hpp
index 814de45..7e7f03a 100644
--- a/tool/pldm_cmd_helper.hpp
+++ b/tool/pldm_cmd_helper.hpp
@@ -5,7 +5,7 @@
 #include "libpldm/fru.h"
 #include "libpldm/platform.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <err.h>
 #include <sys/socket.h>