diff --git a/utils/load-stats-face.cc b/utils/stats/load-stats-face.cc
similarity index 100%
rename from utils/load-stats-face.cc
rename to utils/stats/load-stats-face.cc
diff --git a/utils/load-stats-face.h b/utils/stats/load-stats-face.h
similarity index 100%
rename from utils/load-stats-face.h
rename to utils/stats/load-stats-face.h
diff --git a/utils/load-stats-node.cc b/utils/stats/load-stats-node.cc
similarity index 100%
rename from utils/load-stats-node.cc
rename to utils/stats/load-stats-node.cc
diff --git a/utils/load-stats-node.h b/utils/stats/load-stats-node.h
similarity index 100%
rename from utils/load-stats-node.h
rename to utils/stats/load-stats-node.h
diff --git a/utils/load-stats.cc b/utils/stats/load-stats.cc
similarity index 100%
rename from utils/load-stats.cc
rename to utils/stats/load-stats.cc
diff --git a/utils/load-stats.h b/utils/stats/load-stats.h
similarity index 100%
rename from utils/load-stats.h
rename to utils/stats/load-stats.h
diff --git a/utils/stats-tree.cc b/utils/stats/stats-tree.cc
similarity index 100%
rename from utils/stats-tree.cc
rename to utils/stats/stats-tree.cc
diff --git a/utils/stats-tree.h b/utils/stats/stats-tree.h
similarity index 98%
rename from utils/stats-tree.h
rename to utils/stats/stats-tree.h
index 0b13e2c..955f798 100644
--- a/utils/stats-tree.h
+++ b/utils/stats/stats-tree.h
@@ -21,7 +21,7 @@
 #ifndef STATS_TREE_H
 #define STATS_TREE_H
 
-#include "trie.h"
+#include "../trie/trie.h"
 #include "load-stats-node.h"
 #include "ns3/ndn-name-components.h"
 #include "ns3/ptr.h"
diff --git a/utils/counting-policy.h b/utils/trie/counting-policy.h
similarity index 100%
rename from utils/counting-policy.h
rename to utils/trie/counting-policy.h
diff --git a/utils/detail/functor-hook.h b/utils/trie/detail/functor-hook.h
similarity index 100%
rename from utils/detail/functor-hook.h
rename to utils/trie/detail/functor-hook.h
diff --git a/utils/detail/multi-policy-container.h b/utils/trie/detail/multi-policy-container.h
similarity index 100%
rename from utils/detail/multi-policy-container.h
rename to utils/trie/detail/multi-policy-container.h
diff --git a/utils/detail/multi-type-container.h b/utils/trie/detail/multi-type-container.h
similarity index 100%
rename from utils/detail/multi-type-container.h
rename to utils/trie/detail/multi-type-container.h
diff --git a/utils/empty-policy.h b/utils/trie/empty-policy.h
similarity index 100%
rename from utils/empty-policy.h
rename to utils/trie/empty-policy.h
diff --git a/utils/fifo-policy.h b/utils/trie/fifo-policy.h
similarity index 100%
rename from utils/fifo-policy.h
rename to utils/trie/fifo-policy.h
diff --git a/utils/lru-policy.h b/utils/trie/lru-policy.h
similarity index 100%
rename from utils/lru-policy.h
rename to utils/trie/lru-policy.h
diff --git a/utils/multi-policy.h b/utils/trie/multi-policy.h
similarity index 100%
rename from utils/multi-policy.h
rename to utils/trie/multi-policy.h
diff --git a/utils/payload-policy.h b/utils/trie/payload-policy.h
similarity index 100%
rename from utils/payload-policy.h
rename to utils/trie/payload-policy.h
diff --git a/utils/payload-with-policy.h b/utils/trie/payload-with-policy.h
similarity index 100%
rename from utils/payload-with-policy.h
rename to utils/trie/payload-with-policy.h
diff --git a/utils/persistent-policy.h b/utils/trie/persistent-policy.h
similarity index 100%
rename from utils/persistent-policy.h
rename to utils/trie/persistent-policy.h
diff --git a/utils/random-policy.h b/utils/trie/random-policy.h
similarity index 100%
rename from utils/random-policy.h
rename to utils/trie/random-policy.h
diff --git a/utils/trie-with-policy.h b/utils/trie/trie-with-policy.h
similarity index 100%
rename from utils/trie-with-policy.h
rename to utils/trie/trie-with-policy.h
diff --git a/utils/trie.h b/utils/trie/trie.h
similarity index 100%
rename from utils/trie.h
rename to utils/trie/trie.h