Small reorganization of utils/ folder contents
diff --git a/examples/trie.cc b/examples/trie.cc
index 9000f38..ffd2858 100644
--- a/examples/trie.cc
+++ b/examples/trie.cc
@@ -20,11 +20,11 @@
#include "ns3/core-module.h"
#include "ns3/ndnSIM-module.h"
-#include "../utils/trie-with-policy.h"
-#include "../utils/lru-policy.h"
-#include "../utils/random-policy.h"
-#include "../utils/fifo-policy.h"
-#include "../utils/multi-policy.h"
+#include "../utils/trie/trie-with-policy.h"
+#include "../utils/trie/lru-policy.h"
+#include "../utils/trie/random-policy.h"
+#include "../utils/trie/fifo-policy.h"
+#include "../utils/trie/multi-policy.h"
#include <boost/lexical_cast.hpp>
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"
diff --git a/test/ndnSIM-stats-tree.cc b/test/ndnSIM-stats-tree.cc
index 902cbe4..c1a813f 100644
--- a/test/ndnSIM-stats-tree.cc
+++ b/test/ndnSIM-stats-tree.cc
@@ -22,7 +22,7 @@
#include "ns3/core-module.h"
#include "ns3/point-to-point-module.h"
#include "ns3/ndnSIM-module.h"
-#include "../utils/stats-tree.h"
+#include "../utils/stats/stats-tree.h"
#include "../apps/ndn-producer.h"
#include <boost/lexical_cast.hpp>
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
diff --git a/wscript b/wscript
index 39699be..8f2e59f 100644
--- a/wscript
+++ b/wscript
@@ -58,7 +58,7 @@
module.source = bld.path.ant_glob(['model/**/*.cc',
'apps/*.cc',
- 'utils/*.cc',
+ 'utils/**/*.cc',
'helper/**/*.cc',
])