diff --git a/model/cs/content-store-impl.cc b/model/cs/content-store-impl.cc
index 1b929c5..31cd66e 100644
--- a/model/cs/content-store-impl.cc
+++ b/model/cs/content-store-impl.cc
@@ -23,9 +23,9 @@
 #include "ns3/uinteger.h"
 #include "ns3/string.h"
 
-#include "../../utils/random-policy.h"
-#include "../../utils/lru-policy.h"
-#include "../../utils/fifo-policy.h"
+#include "../../utils/trie/random-policy.h"
+#include "../../utils/trie/lru-policy.h"
+#include "../../utils/trie/fifo-policy.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.cs.ContentStoreImpl");
 
diff --git a/model/cs/content-store-impl.h b/model/cs/content-store-impl.h
index 4b047ee..66ce27c 100644
--- a/model/cs/content-store-impl.h
+++ b/model/cs/content-store-impl.h
@@ -27,7 +27,7 @@
 #include "ns3/ndn-content-object-header.h"
 #include <boost/foreach.hpp>
 
-#include "../../utils/trie-with-policy.h"
+#include "../../utils/trie/trie-with-policy.h"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/fib/ndn-fib-impl.h b/model/fib/ndn-fib-impl.h
index 1efead9..8dcd21e 100644
--- a/model/fib/ndn-fib-impl.h
+++ b/model/fib/ndn-fib-impl.h
@@ -24,8 +24,8 @@
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-name-components.h"
 
-#include "../../utils/trie-with-policy.h"
-#include "../../utils/counting-policy.h"
+#include "../../utils/trie/trie-with-policy.h"
+#include "../../utils/trie/counting-policy.h"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/fw/fw-stats.h b/model/fw/fw-stats.h
index cb50ea7..a54642a 100644
--- a/model/fw/fw-stats.h
+++ b/model/fw/fw-stats.h
@@ -25,7 +25,7 @@
 #include "ns3/event-id.h"
 
 #include "best-route.h"
-#include "../../utils/stats-tree.h"
+#include "../../utils/stats/stats-tree.h"
 
 namespace ns3 {
 namespace ndn {
diff --git a/model/pit/ndn-pit-impl.cc b/model/pit/ndn-pit-impl.cc
index c1e5eb0..2c6e0bf 100644
--- a/model/pit/ndn-pit-impl.cc
+++ b/model/pit/ndn-pit-impl.cc
@@ -24,10 +24,10 @@
 #include "ns3/ndn-content-object-header.h"
 #include "ns3/ndn-forwarding-strategy.h"
 
-#include "../../utils/empty-policy.h"
-#include "../../utils/persistent-policy.h"
-#include "../../utils/random-policy.h"
-#include "../../utils/lru-policy.h"
+#include "../../utils/trie/empty-policy.h"
+#include "../../utils/trie/persistent-policy.h"
+#include "../../utils/trie/random-policy.h"
+#include "../../utils/trie/lru-policy.h"
 
 #include "ns3/log.h"
 #include "ns3/string.h"
diff --git a/model/pit/ndn-pit-impl.h b/model/pit/ndn-pit-impl.h
index 64e1fc0..00cfe3c 100644
--- a/model/pit/ndn-pit-impl.h
+++ b/model/pit/ndn-pit-impl.h
@@ -23,7 +23,7 @@
 
 #include "ndn-pit.h"
 
-#include "../../utils/trie-with-policy.h"
+#include "../../utils/trie/trie-with-policy.h"
 
 #include "ndn-pit-entry-impl.h"