Small reorganization of utils/ folder contents
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 {