diff --git a/algo/unpack/Unpack.h b/algo/unpack/Unpack.h
index 7bf24abfb961f75ad9ac3d76d1963192302ca603..5a0d6dbed4ad9eddbc6bc23ae118ebde0e22e994 100644
--- a/algo/unpack/Unpack.h
+++ b/algo/unpack/Unpack.h
@@ -8,22 +8,22 @@
 
 #include "CbmDigiTimeslice.h"
 
-#include "TofReadoutConfig.h"
-#include "Trd2dReadoutConfig.h"
-#include "TrdReadoutConfig.h"
+#include "tof/TofReadoutConfig.h"
+#include "tof/UnpackTof.h"
+#include "trd/TrdReadoutConfig.h"
+#include "trd/UnpackTrd.h"
+#include "trd2d/Trd2dReadoutConfig.h"
+#include "trd2d/UnpackTrd2d.h"
 
 #include <sstream>
 #include <vector>
 
-#include "BmonReadoutConfig.h"
-#include "MuchReadoutConfig.h"
-#include "StsReadoutConfigLegacy.h"
-#include "UnpackBmon.h"
-#include "UnpackMuch.h"
-#include "UnpackSts.h"
-#include "UnpackTof.h"
-#include "UnpackTrd.h"
-#include "UnpackTrd2d.h"
+#include "bmon/BmonReadoutConfig.h"
+#include "bmon/UnpackBmon.h"
+#include "much/MuchReadoutConfig.h"
+#include "much/UnpackMuch.h"
+#include "sts/StsReadoutConfigLegacy.h"
+#include "sts/UnpackSts.h"
 
 namespace cbm::algo
 {