diff --git a/meson.build b/meson.build
index cc5a78e..290b5c0 100644
--- a/meson.build
+++ b/meson.build
@@ -170,7 +170,7 @@
         executable(
             'test_topology',
             'test/test_topology.cpp',
-            'src/topology.cpp',
+            'src/entity_manager/topology.cpp',
             cpp_args: test_boost_args,
             dependencies: [
                 gtest,
diff --git a/src/configuration.cpp b/src/entity_manager/configuration.cpp
similarity index 99%
rename from src/configuration.cpp
rename to src/entity_manager/configuration.cpp
index 8646f57..5663ec8 100644
--- a/src/configuration.cpp
+++ b/src/entity_manager/configuration.cpp
@@ -1,7 +1,7 @@
 #include "configuration.hpp"
 
+#include "../utils.hpp"
 #include "perform_probe.hpp"
-#include "utils.hpp"
 
 #include <nlohmann/json.hpp>
 #include <valijson/adapters/nlohmann_json_adapter.hpp>
diff --git a/src/configuration.hpp b/src/entity_manager/configuration.hpp
similarity index 100%
rename from src/configuration.hpp
rename to src/entity_manager/configuration.hpp
diff --git a/src/dbus_interface.cpp b/src/entity_manager/dbus_interface.cpp
similarity index 99%
rename from src/dbus_interface.cpp
rename to src/entity_manager/dbus_interface.cpp
index 8c975bb..f0c904c 100644
--- a/src/dbus_interface.cpp
+++ b/src/entity_manager/dbus_interface.cpp
@@ -1,7 +1,7 @@
 #include "dbus_interface.hpp"
 
+#include "../utils.hpp"
 #include "perform_probe.hpp"
-#include "utils.hpp"
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/container/flat_map.hpp>
diff --git a/src/dbus_interface.hpp b/src/entity_manager/dbus_interface.hpp
similarity index 100%
rename from src/dbus_interface.hpp
rename to src/entity_manager/dbus_interface.hpp
diff --git a/src/devices.hpp b/src/entity_manager/devices.hpp
similarity index 100%
rename from src/devices.hpp
rename to src/entity_manager/devices.hpp
diff --git a/src/entity_manager.cpp b/src/entity_manager/entity_manager.cpp
similarity index 99%
rename from src/entity_manager.cpp
rename to src/entity_manager/entity_manager.cpp
index 5f5ec06..5aa5380 100644
--- a/src/entity_manager.cpp
+++ b/src/entity_manager/entity_manager.cpp
@@ -17,13 +17,13 @@
 
 #include "entity_manager.hpp"
 
+#include "../utils.hpp"
+#include "../variant_visitors.hpp"
 #include "configuration.hpp"
 #include "dbus_interface.hpp"
 #include "overlay.hpp"
 #include "perform_scan.hpp"
 #include "topology.hpp"
-#include "utils.hpp"
-#include "variant_visitors.hpp"
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/src/entity_manager.hpp b/src/entity_manager/entity_manager.hpp
similarity index 98%
rename from src/entity_manager.hpp
rename to src/entity_manager/entity_manager.hpp
index 4d8d69d..ccd106e 100644
--- a/src/entity_manager.hpp
+++ b/src/entity_manager/entity_manager.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 #include <systemd/sd-journal.h>
 
diff --git a/src/entity_manager/meson.build b/src/entity_manager/meson.build
new file mode 100644
index 0000000..005a0d0
--- /dev/null
+++ b/src/entity_manager/meson.build
@@ -0,0 +1,23 @@
+executable(
+    'entity-manager',
+    'entity_manager.cpp',
+    'configuration.cpp',
+    '../expression.cpp',
+    'dbus_interface.cpp',
+    'perform_scan.cpp',
+    'perform_probe.cpp',
+    'overlay.cpp',
+    'topology.cpp',
+    '../utils.cpp',
+    cpp_args: cpp_args + ['-DBOOST_ASIO_DISABLE_THREADS'],
+    dependencies: [
+        boost,
+        nlohmann_json_dep,
+        phosphor_logging_dep,
+        sdbusplus,
+        valijson,
+    ],
+    install: true,
+    install_dir: installdir,
+)
+
diff --git a/src/overlay.cpp b/src/entity_manager/overlay.cpp
similarity index 99%
rename from src/overlay.cpp
rename to src/entity_manager/overlay.cpp
index 2c0cbef..8b52fb9 100644
--- a/src/overlay.cpp
+++ b/src/entity_manager/overlay.cpp
@@ -17,8 +17,8 @@
 
 #include "overlay.hpp"
 
+#include "../utils.hpp"
 #include "devices.hpp"
-#include "utils.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/io_context.hpp>
diff --git a/src/overlay.hpp b/src/entity_manager/overlay.hpp
similarity index 100%
rename from src/overlay.hpp
rename to src/entity_manager/overlay.hpp
diff --git a/src/perform_probe.cpp b/src/entity_manager/perform_probe.cpp
similarity index 100%
rename from src/perform_probe.cpp
rename to src/entity_manager/perform_probe.cpp
diff --git a/src/perform_probe.hpp b/src/entity_manager/perform_probe.hpp
similarity index 100%
rename from src/perform_probe.hpp
rename to src/entity_manager/perform_probe.hpp
diff --git a/src/perform_scan.cpp b/src/entity_manager/perform_scan.cpp
similarity index 100%
rename from src/perform_scan.cpp
rename to src/entity_manager/perform_scan.cpp
diff --git a/src/perform_scan.hpp b/src/entity_manager/perform_scan.hpp
similarity index 97%
rename from src/perform_scan.hpp
rename to src/entity_manager/perform_scan.hpp
index 300ffb1..ae57582 100644
--- a/src/perform_scan.hpp
+++ b/src/entity_manager/perform_scan.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 #include <systemd/sd-journal.h>
 
diff --git a/src/topology.cpp b/src/entity_manager/topology.cpp
similarity index 100%
rename from src/topology.cpp
rename to src/entity_manager/topology.cpp
diff --git a/src/topology.hpp b/src/entity_manager/topology.hpp
similarity index 100%
rename from src/topology.hpp
rename to src/entity_manager/topology.hpp
diff --git a/src/meson.build b/src/meson.build
index 3699484..b8a7f0e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,28 +2,7 @@
 cpp_args += ['-DSYSCONF_DIR="' + sysconfdir + '/"']
 installdir = join_paths(get_option('libexecdir'), 'entity-manager')
 
-executable(
-    'entity-manager',
-    'entity_manager.cpp',
-    'configuration.cpp',
-    'expression.cpp',
-    'dbus_interface.cpp',
-    'perform_scan.cpp',
-    'perform_probe.cpp',
-    'overlay.cpp',
-    'topology.cpp',
-    'utils.cpp',
-    cpp_args: cpp_args + ['-DBOOST_ASIO_DISABLE_THREADS'],
-    dependencies: [
-        boost,
-        nlohmann_json_dep,
-        phosphor_logging_dep,
-        sdbusplus,
-        valijson,
-    ],
-    install: true,
-    install_dir: installdir,
-)
+subdir('entity_manager')
 
 if get_option('fru-device')
     cpp_args_fd = cpp_args
diff --git a/test/test_topology.cpp b/test/test_topology.cpp
index 6b9317b..ae6e663 100644
--- a/test/test_topology.cpp
+++ b/test/test_topology.cpp
@@ -1,4 +1,4 @@
-#include "topology.hpp"
+#include "entity_manager/topology.hpp"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"