diff --git a/examples/agent-functionalities/CMakeLists.txt b/examples/agent-functionalities/CMakeLists.txt
index 274d5d0..2c6bf6c 100644
--- a/examples/agent-functionalities/CMakeLists.txt
+++ b/examples/agent-functionalities/CMakeLists.txt
@@ -1,9 +1,4 @@
-add_executable(agent-functionalities agent-functionalities.cpp)
-ROSA_add_library_dependencies(agent-functionalities ROSAConfig)
-ROSA_add_library_dependencies(agent-functionalities ROSACore)
-ROSA_add_library_dependencies(agent-functionalities ROSAAgent)
 
-add_executable(Reliability-functionalities Reliability-functionality.cpp)
-ROSA_add_library_dependencies(Reliability-functionalities ROSAConfig)
-ROSA_add_library_dependencies(Reliability-functionalities ROSACore)
-ROSA_add_library_dependencies(Reliability-functionalities ROSAAgent)
+
+# Add the different subdirectories
+ADDALLSUBDIRS()
diff --git a/examples/agent-functionalities/CMakeLists.txt b/examples/agent-functionalities/Reliability-functionality/CMakeLists.txt
similarity index 52%
copy from examples/agent-functionalities/CMakeLists.txt
copy to examples/agent-functionalities/Reliability-functionality/CMakeLists.txt
index 274d5d0..746b1cd 100644
--- a/examples/agent-functionalities/CMakeLists.txt
+++ b/examples/agent-functionalities/Reliability-functionality/CMakeLists.txt
@@ -1,9 +1,4 @@
-add_executable(agent-functionalities agent-functionalities.cpp)
-ROSA_add_library_dependencies(agent-functionalities ROSAConfig)
-ROSA_add_library_dependencies(agent-functionalities ROSACore)
-ROSA_add_library_dependencies(agent-functionalities ROSAAgent)
-
 add_executable(Reliability-functionalities Reliability-functionality.cpp)
 ROSA_add_library_dependencies(Reliability-functionalities ROSAConfig)
 ROSA_add_library_dependencies(Reliability-functionalities ROSACore)
 ROSA_add_library_dependencies(Reliability-functionalities ROSAAgent)
diff --git a/examples/agent-functionalities/Reliability-functionality.cpp b/examples/agent-functionalities/Reliability-functionality/Reliability-functionality.cpp
similarity index 100%
rename from examples/agent-functionalities/Reliability-functionality.cpp
rename to examples/agent-functionalities/Reliability-functionality/Reliability-functionality.cpp
diff --git a/examples/agent-functionalities/agent-functionalities/CMakeLists.txt b/examples/agent-functionalities/agent-functionalities/CMakeLists.txt
new file mode 100644
index 0000000..077f183
--- /dev/null
+++ b/examples/agent-functionalities/agent-functionalities/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable(agent-functionalities agent-functionalities.cpp)
+ROSA_add_library_dependencies(agent-functionalities ROSAConfig)
+ROSA_add_library_dependencies(agent-functionalities ROSACore)
+ROSA_add_library_dependencies(agent-functionalities ROSAAgent)
+
diff --git a/examples/agent-functionalities/agent-functionalities.cpp b/examples/agent-functionalities/agent-functionalities/agent-functionalities.cpp
similarity index 100%
rename from examples/agent-functionalities/agent-functionalities.cpp
rename to examples/agent-functionalities/agent-functionalities/agent-functionalities.cpp