diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
index ccb0564a5397f6b7b703b2413df47dfe5f484d72..270833aaea551917683f6f4cc9453ac016e4a6da 100644
--- a/src/backends/CMakeLists.txt
+++ b/src/backends/CMakeLists.txt
@@ -1,9 +1,12 @@
 add_subdirectory(default)
 add_subdirectory(detection)
+add_subdirectory(wrappers)
 if(ENABLE_DLB)
-    add_subdirectory(dlb)
+    add_subdirectory(dlb_talp)
+    add_subdirectory(dlb_talp_tree)
 endif()
 
 if(ENABLE_EXTRAE)
-    add_subdirectory(extrae)
+    add_subdirectory(extrae_partial_tracer)
+    add_subdirectory(extrae_type_stack)
 endif()
diff --git a/src/backends/dlb/CMakeLists.txt b/src/backends/dlb/CMakeLists.txt
deleted file mode 100644
index dad14ce6d306798521d1a2661721ad73532035da..0000000000000000000000000000000000000000
--- a/src/backends/dlb/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(dlb)
-add_subdirectory(dlb_talp_tree)
diff --git a/src/backends/dlb/dlb/CMakeLists.txt b/src/backends/dlb/dlb/CMakeLists.txt
deleted file mode 100644
index 9bb7520eaa4a3abb556dfa2bc665b9060e718b51..0000000000000000000000000000000000000000
--- a/src/backends/dlb/dlb/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-target_sources(nesmik PRIVATE dlb.cpp)
diff --git a/src/backends/dlb_talp/CMakeLists.txt b/src/backends/dlb_talp/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..56f83f67ae3d5de9addaaf5ddf277b4dc2ae27cd
--- /dev/null
+++ b/src/backends/dlb_talp/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(nesmik PRIVATE dlb_talp.cpp)
diff --git a/src/backends/dlb/dlb/dlb.cpp b/src/backends/dlb_talp/dlb_talp.cpp
similarity index 93%
rename from src/backends/dlb/dlb/dlb.cpp
rename to src/backends/dlb_talp/dlb_talp.cpp
index a120bf56ec81d62bcc3aa2905b5e988dcd5e2d44..3af603b3e8b0dc18714a27dded033345aab2d016 100644
--- a/src/backends/dlb/dlb/dlb.cpp
+++ b/src/backends/dlb_talp/dlb_talp.cpp
@@ -1,5 +1,6 @@
-#include "dlb.hpp"
+#include "dlb_talp.hpp"
 
+#include <backends/wrappers/dlb/dlb_wrapper.hpp>
 #include <iostream>
 
 #include "dlb.h"
diff --git a/src/backends/dlb/dlb/dlb.hpp b/src/backends/dlb_talp/dlb_talp.hpp
similarity index 100%
rename from src/backends/dlb/dlb/dlb.hpp
rename to src/backends/dlb_talp/dlb_talp.hpp
diff --git a/src/backends/dlb/dlb_talp_tree/CMakeLists.txt b/src/backends/dlb_talp_tree/CMakeLists.txt
similarity index 100%
rename from src/backends/dlb/dlb_talp_tree/CMakeLists.txt
rename to src/backends/dlb_talp_tree/CMakeLists.txt
diff --git a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree.cpp b/src/backends/dlb_talp_tree/dlb_talp_tree.cpp
similarity index 100%
rename from src/backends/dlb/dlb_talp_tree/dlb_talp_tree.cpp
rename to src/backends/dlb_talp_tree/dlb_talp_tree.cpp
diff --git a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree.hpp b/src/backends/dlb_talp_tree/dlb_talp_tree.hpp
similarity index 98%
rename from src/backends/dlb/dlb_talp_tree/dlb_talp_tree.hpp
rename to src/backends/dlb_talp_tree/dlb_talp_tree.hpp
index a5073a15f1cebcde2462876a7a7f91f09a37cc23..8cc923d4b917201795c5dbe001ed077cad690fce 100644
--- a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree.hpp
+++ b/src/backends/dlb_talp_tree/dlb_talp_tree.hpp
@@ -8,7 +8,7 @@
 #include <utils/parallelism_helper.hpp>
 #include <vector>
 
-#include "../dlb/dlb.hpp"
+#include "../dlb_talp/dlb_talp.hpp"
 #include "dlb.h"
 #include "dlb_talp.h"
 #include "strategies.hpp"
diff --git a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree_ascii_serializer.cpp b/src/backends/dlb_talp_tree/dlb_talp_tree_ascii_serializer.cpp
similarity index 100%
rename from src/backends/dlb/dlb_talp_tree/dlb_talp_tree_ascii_serializer.cpp
rename to src/backends/dlb_talp_tree/dlb_talp_tree_ascii_serializer.cpp
diff --git a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree_ascii_serializer.hpp b/src/backends/dlb_talp_tree/dlb_talp_tree_ascii_serializer.hpp
similarity index 100%
rename from src/backends/dlb/dlb_talp_tree/dlb_talp_tree_ascii_serializer.hpp
rename to src/backends/dlb_talp_tree/dlb_talp_tree_ascii_serializer.hpp
diff --git a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree_json_serializer.cpp b/src/backends/dlb_talp_tree/dlb_talp_tree_json_serializer.cpp
similarity index 100%
rename from src/backends/dlb/dlb_talp_tree/dlb_talp_tree_json_serializer.cpp
rename to src/backends/dlb_talp_tree/dlb_talp_tree_json_serializer.cpp
diff --git a/src/backends/dlb/dlb_talp_tree/dlb_talp_tree_json_serializer.hpp b/src/backends/dlb_talp_tree/dlb_talp_tree_json_serializer.hpp
similarity index 100%
rename from src/backends/dlb/dlb_talp_tree/dlb_talp_tree_json_serializer.hpp
rename to src/backends/dlb_talp_tree/dlb_talp_tree_json_serializer.hpp
diff --git a/src/backends/extrae/CMakeLists.txt b/src/backends/extrae/CMakeLists.txt
deleted file mode 100644
index e8ec467adcb3b949d497598cec807f4d962e1ae0..0000000000000000000000000000000000000000
--- a/src/backends/extrae/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-target_sources(nesmik PRIVATE extrae_partial_tracer.cpp extrae_type_stack.cpp extrae_wrapper.cpp paraver_config.cpp)
diff --git a/src/backends/extrae_partial_tracer/CMakeLists.txt b/src/backends/extrae_partial_tracer/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dff45e3648439f847f603d8f4e61e1a1e8a32b73
--- /dev/null
+++ b/src/backends/extrae_partial_tracer/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(nesmik PRIVATE extrae_partial_tracer.cpp)
diff --git a/src/backends/extrae/extrae_partial_tracer.cpp b/src/backends/extrae_partial_tracer/extrae_partial_tracer.cpp
similarity index 100%
rename from src/backends/extrae/extrae_partial_tracer.cpp
rename to src/backends/extrae_partial_tracer/extrae_partial_tracer.cpp
diff --git a/src/backends/extrae/extrae_partial_tracer.hpp b/src/backends/extrae_partial_tracer/extrae_partial_tracer.hpp
similarity index 94%
rename from src/backends/extrae/extrae_partial_tracer.hpp
rename to src/backends/extrae_partial_tracer/extrae_partial_tracer.hpp
index b4b0a3a7409dbcafbfd7ee68fc46be1cefe0caba..f704595e6c9597e3b55236957407699a3687cd47 100644
--- a/src/backends/extrae/extrae_partial_tracer.hpp
+++ b/src/backends/extrae_partial_tracer/extrae_partial_tracer.hpp
@@ -1,11 +1,12 @@
+#include <backends/extrae_type_stack/extrae_type_stack.hpp>
+#include <backends/wrappers/extrae/extrae_wrapper.hpp>
 #include <strategies.hpp>
 #include <string>
+#include <unordered_map>
 #include <utils/environment_variable.hpp>
 #include <utils/parallelism_helper.hpp>
 #include <vector>
 
-#include "extrae_type_stack.hpp"
-
 struct StartStopJob {
   std::string region_name;
   unsigned int start_at;
diff --git a/src/backends/extrae_type_stack/CMakeLists.txt b/src/backends/extrae_type_stack/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..319ef9c27d5508c01cc65f0459e4f3ff4b222c0a
--- /dev/null
+++ b/src/backends/extrae_type_stack/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(nesmik PRIVATE extrae_type_stack.cpp)
diff --git a/src/backends/extrae/extrae_type_stack.cpp b/src/backends/extrae_type_stack/extrae_type_stack.cpp
similarity index 100%
rename from src/backends/extrae/extrae_type_stack.cpp
rename to src/backends/extrae_type_stack/extrae_type_stack.cpp
diff --git a/src/backends/extrae/extrae_type_stack.hpp b/src/backends/extrae_type_stack/extrae_type_stack.hpp
similarity index 92%
rename from src/backends/extrae/extrae_type_stack.hpp
rename to src/backends/extrae_type_stack/extrae_type_stack.hpp
index 3cd2ee84f85d7ec0a9308488d133419a9e932985..2275991eb64c364dd04049bf67ad20ae2d6576df 100644
--- a/src/backends/extrae/extrae_type_stack.hpp
+++ b/src/backends/extrae_type_stack/extrae_type_stack.hpp
@@ -1,13 +1,13 @@
 #ifndef NESMIK_EXTRAE_TYPE_STACK_HPP
 #define NESMIK_EXTRAE_TYPE_STACK_HPP
+#include <backends/wrappers/extrae/extrae_types.hpp>
+#include <backends/wrappers/extrae/extrae_wrapper.hpp>
 #include <stack>
 #include <string>
 #include <unordered_map>
 #include <utils/environment_variable.hpp>
 #include <utils/parallelism_helper.hpp>
 
-#include "extrae_types.hpp"
-#include "extrae_wrapper.hpp"
 #include "strategies.hpp"
 
 class ExtraeTypeStackStrategy : public ProperlyNestedAnnotationStrategy {
diff --git a/src/backends/wrappers/CMakeLists.txt b/src/backends/wrappers/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9f5951d6c754021148f425cdc53c6038ec84ac80
--- /dev/null
+++ b/src/backends/wrappers/CMakeLists.txt
@@ -0,0 +1,7 @@
+if(ENABLE_DLB)
+    add_subdirectory(dlb)
+endif()
+
+if(ENABLE_EXTRAE)
+    add_subdirectory(extrae)
+endif()
diff --git a/src/backends/wrappers/dlb/CMakeLists.txt b/src/backends/wrappers/dlb/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3bb584794a57516084d7d20af856288c449c2b16
--- /dev/null
+++ b/src/backends/wrappers/dlb/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(nesmik PRIVATE dlb_wrapper.cpp)
diff --git a/src/backends/wrappers/dlb/dlb_wrapper.cpp b/src/backends/wrappers/dlb/dlb_wrapper.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/backends/wrappers/dlb/dlb_wrapper.hpp b/src/backends/wrappers/dlb/dlb_wrapper.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/backends/wrappers/extrae/CMakeLists.txt b/src/backends/wrappers/extrae/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba3bc1114ee4223854009f9a50efcda6f6040623
--- /dev/null
+++ b/src/backends/wrappers/extrae/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(nesmik PRIVATE extrae_wrapper.cpp paraver_config.cpp)
diff --git a/src/backends/extrae/extrae_types.hpp b/src/backends/wrappers/extrae/extrae_types.hpp
similarity index 100%
rename from src/backends/extrae/extrae_types.hpp
rename to src/backends/wrappers/extrae/extrae_types.hpp
diff --git a/src/backends/extrae/extrae_wrapper.cpp b/src/backends/wrappers/extrae/extrae_wrapper.cpp
similarity index 100%
rename from src/backends/extrae/extrae_wrapper.cpp
rename to src/backends/wrappers/extrae/extrae_wrapper.cpp
diff --git a/src/backends/extrae/extrae_wrapper.hpp b/src/backends/wrappers/extrae/extrae_wrapper.hpp
similarity index 92%
rename from src/backends/extrae/extrae_wrapper.hpp
rename to src/backends/wrappers/extrae/extrae_wrapper.hpp
index 125668fc1c311036542c8e83c148756cccba623b..1849c1d6df043c5e75181467fb3a8e3eb9b7632b 100644
--- a/src/backends/extrae/extrae_wrapper.hpp
+++ b/src/backends/wrappers/extrae/extrae_wrapper.hpp
@@ -1,3 +1,5 @@
+#ifndef NESMIK_EXTRAE_WRAPPER_HPP
+#define NESMIK_EXTRAE_WRAPPER_HPP
 #include <optional>
 #include <string>
 #include <unordered_map>
@@ -37,3 +39,5 @@ class ExtraeWrapper {
   std::string getParaverConfig(ExtraeParaverConfig config);
   void Finalize();
 };
+
+#endif  // NESMIK_EXTRAE_WRAPPER_HPP
diff --git a/src/backends/extrae/paraver_config.cpp b/src/backends/wrappers/extrae/paraver_config.cpp
similarity index 100%
rename from src/backends/extrae/paraver_config.cpp
rename to src/backends/wrappers/extrae/paraver_config.cpp
diff --git a/src/backends/extrae/paraver_config.hpp b/src/backends/wrappers/extrae/paraver_config.hpp
similarity index 100%
rename from src/backends/extrae/paraver_config.hpp
rename to src/backends/wrappers/extrae/paraver_config.hpp
diff --git a/src/delegator.cpp b/src/delegator.cpp
index bb7a54f0ae703cea9050206c6cd9fd2ffa134bb1..9317f5df4a3c39ab1e6ef951d417b47d497c4209 100644
--- a/src/delegator.cpp
+++ b/src/delegator.cpp
@@ -1,3 +1,5 @@
+#include <backends/default/default.hpp>
+#include <backends/detection/detection.hpp>
 #include <delegator.hpp>
 #include <iostream>
 #include <memory>
@@ -9,17 +11,14 @@
 #include <utils/string_helpers.hpp>
 #include <utils/terminator.hpp>
 #include <vector>
-
-#include "backends/default/default.hpp"
-#include "backends/detection/detection.hpp"
 #ifdef ENABLE_DLB
-#include "backends/dlb/dlb/dlb.hpp"
-#include "backends/dlb/dlb_talp_tree/dlb_talp_tree.hpp"
+#include <backends/dlb_talp/dlb_talp.hpp>
+#include <backends/dlb_talp_tree/dlb_talp_tree.hpp>
 #endif
 
 #ifdef ENABLE_EXTRAE
-#include "backends/extrae/extrae_partial_tracer.hpp"
-#include "backends/extrae/extrae_type_stack.hpp"
+#include <backends/extrae_partial_tracer/extrae_partial_tracer.hpp>
+#include <backends/extrae_type_stack/extrae_type_stack.hpp>
 #endif
 
 void Delegator::InitNonProperlyNestedBackends(const std::string &backend) {