diff --git a/host-bmc/custom_dbus.cpp b/host-bmc/dbus/custom_dbus.cpp
similarity index 100%
rename from host-bmc/custom_dbus.cpp
rename to host-bmc/dbus/custom_dbus.cpp
diff --git a/host-bmc/custom_dbus.hpp b/host-bmc/dbus/custom_dbus.hpp
similarity index 100%
rename from host-bmc/custom_dbus.hpp
rename to host-bmc/dbus/custom_dbus.hpp
diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index a0adb84..955736c 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -4,7 +4,7 @@
 #ifdef OEM_IBM
 #include <libpldm/oem/ibm/fru.h>
 #endif
-#include "custom_dbus.hpp"
+#include "dbus/custom_dbus.hpp"
 
 #include <assert.h>
 
diff --git a/host-bmc/test/custom_dbus_test.cpp b/host-bmc/test/custom_dbus_test.cpp
index 4549c0d..be23924 100644
--- a/host-bmc/test/custom_dbus_test.cpp
+++ b/host-bmc/test/custom_dbus_test.cpp
@@ -1,4 +1,4 @@
-#include "../custom_dbus.hpp"
+#include "../dbus/custom_dbus.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/host-bmc/test/meson.build b/host-bmc/test/meson.build
index 9b7cbba..d102ff7 100644
--- a/host-bmc/test/meson.build
+++ b/host-bmc/test/meson.build
@@ -5,7 +5,7 @@
 test_sources = [
   '../../common/utils.cpp',
   '../utils.cpp',
-  '../custom_dbus.cpp',
+  '../dbus/custom_dbus.cpp',
 ]
 
 tests = [
diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build
index 151806b..ce05dce 100644
--- a/libpldmresponder/meson.build
+++ b/libpldmresponder/meson.build
@@ -28,7 +28,7 @@
   '../host-bmc/dbus_to_event_handler.cpp',
   '../host-bmc/dbus_to_host_effecters.cpp',
   '../host-bmc/host_condition.cpp',
-  '../host-bmc/custom_dbus.cpp',
+  '../host-bmc/dbus/custom_dbus.cpp',
   '../host-bmc/utils.cpp',
   'event_parser.cpp'
 ]