diff --git a/helper/ccnx-stack-helper.cc b/helper/ccnx-stack-helper.cc
index 22f0f22..4fdb8a5 100644
--- a/helper/ccnx-stack-helper.cc
+++ b/helper/ccnx-stack-helper.cc
@@ -41,13 +41,7 @@
 
 #include "ns3/node-list.h"
 #include "ns3/loopback-net-device.h"
-#include "ns3/global-router-interface.h"
-#include "ns3/ipv4.h"
-#include "ns3/ipv4-global-routing.h"
-#include "../utils/ipv4-global-routing-ordered-nexthops.h"
 
-#include "ns3/ipv4-routing-helper.h"
-#include "ns3/ipv4-global-routing-helper.h"
 #include "ns3/data-rate.h"
 
 #include "ccnx-face-container.h"
diff --git a/model/ccnx-bestroute-strategy.cc b/model/ccnx-bestroute-strategy.cc
index 2f3057f..1e13726 100644
--- a/model/ccnx-bestroute-strategy.cc
+++ b/model/ccnx-bestroute-strategy.cc
@@ -23,7 +23,7 @@
 #include "ccnx-interest-header.h"
 #include "ccnx-pit.h"
 #include "ccnx-pit-entry.h"
-#include "ccnx-path-stretch-tag.h"
+#include "ns3/weights-path-stretch-tag.h"
 
 #include "ns3/assert.h"
 #include "ns3/log.h"
diff --git a/model/ccnx-content-store.h b/model/ccnx-content-store.h
index 9f07a47..9095223 100644
--- a/model/ccnx-content-store.h
+++ b/model/ccnx-content-store.h
@@ -38,7 +38,7 @@
 #include <boost/tuple/tuple.hpp>
 
 #include "ccnx.h"
-#include "hash-helper.h"
+#include "ccnx-name-components-hash-helper.h"
 #include "ccnx-content-object-header.h"
 #include "ccnx-interest-header.h"
 #include "ccnx-name-components.h"
diff --git a/model/ccnx-face.cc b/model/ccnx-face.cc
index 78266fe..19ec448 100644
--- a/model/ccnx-face.cc
+++ b/model/ccnx-face.cc
@@ -30,7 +30,7 @@
 #include "ns3/boolean.h"
 #include "ns3/simulator.h"
 
-#include "ccnx-path-stretch-tag.h"
+#include "ns3/weights-path-stretch-tag.h"
 
 #include <boost/ref.hpp>
 
diff --git a/model/ccnx-fib.h b/model/ccnx-fib.h
index 36e4d6e..e9474d0 100644
--- a/model/ccnx-fib.h
+++ b/model/ccnx-fib.h
@@ -21,7 +21,7 @@
 #ifndef _CCNX_FIB_H_
 #define	_CCNX_FIB_H_
 
-#include "hash-helper.h"
+#include "ccnx-name-components-hash-helper.h"
 #include "ccnx-face.h"
 #include "ccnx.h"
 #include "ns3/nstime.h"
diff --git a/model/ccnx-flooding-strategy.cc b/model/ccnx-flooding-strategy.cc
index 64521b3..278f847 100644
--- a/model/ccnx-flooding-strategy.cc
+++ b/model/ccnx-flooding-strategy.cc
@@ -22,7 +22,7 @@
 #include "ccnx-interest-header.h"
 #include "ccnx-pit.h"
 #include "ccnx-pit-entry.h"
-#include "ccnx-path-stretch-tag.h"
+#include "ns3/weights-path-stretch-tag.h"
 
 #include "ns3/assert.h"
 #include "ns3/log.h"
diff --git a/model/ccnx-local-face.cc b/model/ccnx-local-face.cc
index f3abba9..de01212 100644
--- a/model/ccnx-local-face.cc
+++ b/model/ccnx-local-face.cc
@@ -33,7 +33,7 @@
 
 #include "ccnx-interest-header.h"
 #include "ccnx-content-object-header.h"
-#include "ccnx-path-stretch-tag.h"
+#include "ns3/weights-path-stretch-tag.h"
 
 NS_LOG_COMPONENT_DEFINE ("CcnxLocalFace");
 
diff --git a/model/hash-helper.h b/model/ccnx-name-components-hash-helper.h
similarity index 100%
rename from model/hash-helper.h
rename to model/ccnx-name-components-hash-helper.h
diff --git a/model/ccnx-pit.h b/model/ccnx-pit.h
index 84cd0d5..70347e4 100644
--- a/model/ccnx-pit.h
+++ b/model/ccnx-pit.h
@@ -25,7 +25,7 @@
 #include "ns3/nstime.h"
 #include "ns3/event-id.h"
 
-#include "hash-helper.h"
+#include "ccnx-name-components-hash-helper.h"
 #include "ccnx-pit-entry.h"
 
 #include <boost/multi_index_container.hpp>
diff --git a/model/annotated-topology-reader.cc b/utils/annotated-topology-reader.cc
similarity index 100%
rename from model/annotated-topology-reader.cc
rename to utils/annotated-topology-reader.cc
diff --git a/model/annotated-topology-reader.h b/utils/annotated-topology-reader.h
similarity index 100%
rename from model/annotated-topology-reader.h
rename to utils/annotated-topology-reader.h
diff --git a/model/batches.cc b/utils/batches.cc
similarity index 100%
rename from model/batches.cc
rename to utils/batches.cc
diff --git a/model/batches.h b/utils/batches.h
similarity index 100%
rename from model/batches.h
rename to utils/batches.h
diff --git a/model/rocketfuel-weights-reader.cc b/utils/rocketfuel-weights-reader.cc
similarity index 100%
rename from model/rocketfuel-weights-reader.cc
rename to utils/rocketfuel-weights-reader.cc
diff --git a/model/rocketfuel-weights-reader.h b/utils/rocketfuel-weights-reader.h
similarity index 100%
rename from model/rocketfuel-weights-reader.h
rename to utils/rocketfuel-weights-reader.h
diff --git a/model/ccnx-path-stretch-tag.cc b/utils/weights-path-stretch-tag.cc
similarity index 96%
rename from model/ccnx-path-stretch-tag.cc
rename to utils/weights-path-stretch-tag.cc
index 31adca1..fe3e41c 100644
--- a/model/ccnx-path-stretch-tag.cc
+++ b/utils/weights-path-stretch-tag.cc
@@ -16,9 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
+ *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
  
-#include "ccnx-path-stretch-tag.h"
+#include "weights-path-stretch-tag.h"
 #include "ns3/node.h"
 #include "ns3/names.h"
 
diff --git a/model/ccnx-path-stretch-tag.h b/utils/weights-path-stretch-tag.h
similarity index 100%
rename from model/ccnx-path-stretch-tag.h
rename to utils/weights-path-stretch-tag.h
diff --git a/wscript b/wscript
index 4839954..06ee05c 100644
--- a/wscript
+++ b/wscript
@@ -69,23 +69,20 @@
 
         "apps/ccnx-app.h",
 
-        "model/hash-helper.h",
         "model/ccnx.h",
+        "model/ccnx-fib.h",
         "model/ccnx-face.h",
-
         "model/ccnx-interest-header.h",
         "model/ccnx-content-object-header.h",
         "model/ccnx-name-components.h",
-        "model/ccnx-path-stretch-tag.h",
-        "model/ccnx-fib.h",
+        "model/ccnx-name-components-hash-helper.h",
 
+        "utils/batches.h",
+        "utils/weights-path-stretch-tag.h",
         "utils/spring-mobility-model.h",
         "utils/spring-mobility-helper.h",
-
-        "model/rocketfuel-weights-reader.h",
-        "model/annotated-topology-reader.h",
-
-        "model/batches.h"
+        "utils/rocketfuel-weights-reader.h",
+        "utils/annotated-topology-reader.h",
         ]
 
     tests.source = bld.path.ant_glob('test/*.cc');