diff --git a/dbus_to_host_effecters.cpp b/host-bmc/dbus_to_host_effecters.cpp
similarity index 100%
rename from dbus_to_host_effecters.cpp
rename to host-bmc/dbus_to_host_effecters.cpp
diff --git a/dbus_to_host_effecters.hpp b/host-bmc/dbus_to_host_effecters.hpp
similarity index 100%
rename from dbus_to_host_effecters.hpp
rename to host-bmc/dbus_to_host_effecters.hpp
diff --git a/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
similarity index 100%
rename from host_pdr_handler.cpp
rename to host-bmc/host_pdr_handler.cpp
diff --git a/host_pdr_handler.hpp b/host-bmc/host_pdr_handler.hpp
similarity index 100%
rename from host_pdr_handler.hpp
rename to host-bmc/host_pdr_handler.hpp
diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build
index 8231630..a4a8b67 100644
--- a/libpldmresponder/meson.build
+++ b/libpldmresponder/meson.build
@@ -20,7 +20,7 @@
   'platform.cpp',
   'fru_parser.cpp',
   'fru.cpp',
-  '../host_pdr_handler.cpp',
+  '../host-bmc/host_pdr_handler.cpp',
   'event_parser.cpp'
 ]
 
diff --git a/libpldmresponder/platform.hpp b/libpldmresponder/platform.hpp
index 10d0b27..ccd3ddf 100644
--- a/libpldmresponder/platform.hpp
+++ b/libpldmresponder/platform.hpp
@@ -7,7 +7,7 @@
 
 #include "event_parser.hpp"
 #include "handler.hpp"
-#include "host_pdr_handler.hpp"
+#include "host-bmc/host_pdr_handler.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
 #include "utils.hpp"
diff --git a/meson.build b/meson.build
index 901c4d8..b3f39fe 100644
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,7 @@
   'dbus_impl_requester.cpp',
   'instance_id.cpp',
   'dbus_impl_pdr.cpp',
-  'dbus_to_host_effecters.cpp',
+  'host-bmc/dbus_to_host_effecters.cpp',
   implicit_include_directories: false,
   dependencies: deps,
   install: true,
diff --git a/pldmd.cpp b/pldmd.cpp
index 0102047..ed7e80e 100644
--- a/pldmd.cpp
+++ b/pldmd.cpp
@@ -5,8 +5,8 @@
 
 #include "dbus_impl_pdr.hpp"
 #include "dbus_impl_requester.hpp"
-#include "dbus_to_host_effecters.hpp"
-#include "host_pdr_handler.hpp"
+#include "host-bmc/dbus_to_host_effecters.hpp"
+#include "host-bmc/host_pdr_handler.hpp"
 #include "invoker.hpp"
 #include "libpldmresponder/base.hpp"
 #include "libpldmresponder/bios.hpp"
diff --git a/test/libpldmresponder_dbus_to_host_effecter_test.cpp b/test/libpldmresponder_dbus_to_host_effecter_test.cpp
index e9ca8cc..56b62e9 100644
--- a/test/libpldmresponder_dbus_to_host_effecter_test.cpp
+++ b/test/libpldmresponder_dbus_to_host_effecter_test.cpp
@@ -1,4 +1,4 @@
-#include "dbus_to_host_effecters.hpp"
+#include "host-bmc/dbus_to_host_effecters.hpp"
 #include "mocked_utils.hpp"
 #include "utils.hpp"
 
diff --git a/test/meson.build b/test/meson.build
index 9bef526..3f30a60 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -18,8 +18,8 @@
           sources: [
             '../instance_id.cpp',
             '../dbus_impl_requester.cpp',
-            '../host_pdr_handler.cpp',
-            '../dbus_to_host_effecters.cpp'])
+            '../host-bmc/host_pdr_handler.cpp',
+            '../host-bmc/dbus_to_host_effecters.cpp'])
 
 tests = [
   'libpldmresponder_base_test',