diff --git a/Bigfoot/Benchmarks/Engine/AssetContainer/AssetContainer.cpp b/Bigfoot/Benchmarks/Engine/Asset/AssetContainer.cpp
similarity index 95%
rename from Bigfoot/Benchmarks/Engine/AssetContainer/AssetContainer.cpp
rename to Bigfoot/Benchmarks/Engine/Asset/AssetContainer.cpp
index 68cf1a0..7cac9e6 100644
--- a/Bigfoot/Benchmarks/Engine/AssetContainer/AssetContainer.cpp
+++ b/Bigfoot/Benchmarks/Engine/Asset/AssetContainer.cpp
@@ -1,3 +1,9 @@
+/*********************************************************************
+ * \file   AssetContainer.cpp
+ *
+ * \author Romain BOULLARD
+ * \date   August 2026
+ *********************************************************************/
 #include <Engine/Asset/AssetContainer.hpp>
 
 #include <AssetsForBenchmarking/Asset/BenchmarkAsset.hpp>
@@ -9,7 +15,6 @@
 
 namespace Bigfoot
 {
-#ifdef BIGFOOT_TOOLMODE
 namespace
 {
 using Random = effolkronium::random_static;
@@ -67,7 +72,6 @@ void Get(benchmark::State& state)
     }
 
     state.SetItemsProcessed(state.iterations() * count);
-    state.SetBytesProcessed(static_cast<std::int64_t>(state.iterations() * count * sizeof(BenchmarkAsset)));
 }
 
 BENCHMARK(Get)->Name("AssetContainer/Get")->Arg(512)->Arg(8192)->Arg(131'072);
@@ -167,5 +171,4 @@ void Remove(benchmark::State& state)
 }
 
 BENCHMARK(Remove)->Name("AssetContainer/Remove")->Arg(512)->Arg(8192)->Arg(131'072);
-#endif
 }   // namespace Bigfoot
diff --git a/Bigfoot/Benchmarks/Engine/Reference/Reference.cpp b/Bigfoot/Benchmarks/Engine/Asset/Reference.cpp
similarity index 94%
rename from Bigfoot/Benchmarks/Engine/Reference/Reference.cpp
rename to Bigfoot/Benchmarks/Engine/Asset/Reference.cpp
index 6cbe085..e61af86 100644
--- a/Bigfoot/Benchmarks/Engine/Reference/Reference.cpp
+++ b/Bigfoot/Benchmarks/Engine/Asset/Reference.cpp
@@ -1,3 +1,9 @@
+/*********************************************************************
+ * \file   Reference.cpp
+ *
+ * \author Romain BOULLARD
+ * \date   August 2026
+ *********************************************************************/
 #include <Engine/Asset/Reference.hpp>
 
 #include <Engine/Asset/AssetLibrary.hpp>
@@ -12,7 +18,6 @@
 
 namespace Bigfoot
 {
-#ifdef BIGFOOT_TOOLMODE
 template<template<class> class REFERENCE>
 void Construct(benchmark::State& state)
 {
@@ -128,5 +133,4 @@ void Move(benchmark::State& state)
 
 BENCHMARK_TEMPLATE(Move, HardReference)->Name("Reference/HardReference/Move");
 BENCHMARK_TEMPLATE(Move, SoftReference)->Name("Reference/SoftReference/Move");
-#endif
 }   // namespace Bigfoot
diff --git a/Bigfoot/Benchmarks/Utils/Container/SlotMap.cpp b/Bigfoot/Benchmarks/Utils/Containers/SlotMap.cpp
similarity index 100%
rename from Bigfoot/Benchmarks/Utils/Container/SlotMap.cpp
rename to Bigfoot/Benchmarks/Utils/Containers/SlotMap.cpp