diff --git a/examples/wireless/multirate.cc b/examples/wireless/multirate.cc
index 27b974e06..48feee414 100644
--- a/examples/wireless/multirate.cc
+++ b/examples/wireless/multirate.cc
@@ -52,7 +52,7 @@
 #include "ns3/network-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/random-variable-stream.h"
 #include "ns3/wifi-module.h"
 #include "ns3/internet-module.h"
diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc
index 7a0c59013..549465c7a 100644
--- a/examples/wireless/wifi-adhoc.cc
+++ b/examples/wireless/wifi-adhoc.cc
@@ -22,7 +22,7 @@
 #include "ns3/network-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/wifi-module.h"
 
 #include <iostream>
diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc
index c69707786..ddba2b648 100644
--- a/examples/wireless/wifi-clear-channel-cmu.cc
+++ b/examples/wireless/wifi-clear-channel-cmu.cc
@@ -21,7 +21,7 @@
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/wifi-module.h"
 #include "ns3/internet-module.h"
 
diff --git a/examples/wireless/wscript b/examples/wireless/wscript
index 701ee981b..80d28884d 100644
--- a/examples/wireless/wscript
+++ b/examples/wireless/wscript
@@ -8,16 +8,16 @@ def build(bld):
     bld.register_ns3_script('mixed-wireless.py', ['core', 'mobility', 'wifi', 'applications', 'point-to-point', 
                                                     'internet', 'csma', 'olsr'])
 
-    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'tools'])
+    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'stats'])
     obj.source = 'wifi-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'tools'])
+    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'stats'])
     obj.source = 'wifi-clear-channel-cmu.cc'
 
-    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats'])
     obj.source = 'wifi-ap.cc'
 
-    bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'tools'])
+    bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats'])
 
     obj = bld.create_ns3_program('wifi-wired-bridging', ['internet', 'mobility', 'wifi', 'csma', 'bridge', 'applications'])
     obj.source = 'wifi-wired-bridging.cc'
@@ -25,25 +25,25 @@ def build(bld):
     obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
     obj.source = 'simple-wifi-frame-aggregation.cc'
 
-    obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'tools', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
+    obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'stats', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
     obj.source = 'multirate.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'stats'])
     obj.source = 'wifi-simple-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'tools', 'point-to-point'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'stats', 'point-to-point'])
     obj.source = 'wifi-simple-adhoc-grid.cc'
 
     obj = bld.create_ns3_program('wifi-simple-infra', ['internet', 'mobility', 'wifi','config-store'])
     obj.source = 'wifi-simple-infra.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'stats'])
     obj.source = 'wifi-simple-interference.cc'
 
     obj = bld.create_ns3_program('wifi-blockack', ['internet', 'mobility', 'wifi', 'applications'])
     obj.source = 'wifi-blockack.cc'
 
-    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats'])
     obj.source = 'ofdm-validation.cc'
 
     obj = bld.create_ns3_program('wifi-hidden-terminal', ['internet', 'mobility', 'wifi', 'applications', 'propagation', 'flow-monitor'])
diff --git a/src/tools/examples/gnuplot-example.cc b/src/stats/examples/gnuplot-example.cc
similarity index 100%
rename from src/tools/examples/gnuplot-example.cc
rename to src/stats/examples/gnuplot-example.cc
diff --git a/src/tools/examples/wscript b/src/stats/examples/wscript
similarity index 75%
rename from src/tools/examples/wscript
rename to src/stats/examples/wscript
index 13024cfc6..bc1bfbf6e 100644
--- a/src/tools/examples/wscript
+++ b/src/stats/examples/wscript
@@ -4,7 +4,7 @@ def build(bld):
     if not bld.env['ENABLE_EXAMPLES']:
         return;
 
-    obj = bld.create_ns3_program('gnuplot-example', ['tools'])
+    obj = bld.create_ns3_program('gnuplot-example', ['stats'])
     obj.source = 'gnuplot-example.cc'
 
 
diff --git a/src/tools/model/gnuplot.cc b/src/stats/model/gnuplot.cc
similarity index 100%
rename from src/tools/model/gnuplot.cc
rename to src/stats/model/gnuplot.cc
diff --git a/src/tools/model/gnuplot.h b/src/stats/model/gnuplot.h
similarity index 100%
rename from src/tools/model/gnuplot.h
rename to src/stats/model/gnuplot.h
diff --git a/src/tools/test/examples-to-run.py b/src/stats/test/examples-to-run.py
similarity index 100%
rename from src/tools/test/examples-to-run.py
rename to src/stats/test/examples-to-run.py
diff --git a/src/stats/wscript b/src/stats/wscript
index 5bc00c8af..3b2591ea7 100644
--- a/src/stats/wscript
+++ b/src/stats/wscript
@@ -19,6 +19,7 @@ def build(bld):
         'model/data-output-interface.cc',
         'model/omnet-data-output.cc',
         'model/data-collector.cc',
+        'model/gnuplot.cc',
         ]
 
     module_test = bld.create_ns3_module_test_library('stats')
@@ -36,6 +37,7 @@ def build(bld):
         'model/data-output-interface.h',
         'model/omnet-data-output.h',
         'model/data-collector.h',
+        'model/gnuplot.h',
         ]
 
     if bld.env['SQLITE_STATS']:
@@ -43,4 +45,7 @@ def build(bld):
         obj.source.append('model/sqlite-data-output.cc')
         obj.use.append('SQLITE3')
 
+    if (bld.env['ENABLE_EXAMPLES']):
+        bld.recurse('examples')
+
     bld.ns3_python_bindings()
diff --git a/src/tools/wscript b/src/tools/wscript
index 0bf0ee6b7..dee7d60d0 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -4,7 +4,6 @@ def build(bld):
 
     module = bld.create_ns3_module('tools', ['network', 'stats'])
     module.source = [
-        'model/gnuplot.cc',
         'model/delay-jitter-estimation.cc',
         ]
 
@@ -17,11 +16,6 @@ def build(bld):
     headers.module = 'tools'
     headers.source = [
         'model/average.h',
-        'model/gnuplot.h',
         'model/delay-jitter-estimation.h',
         ]
 
-    if (bld.env['ENABLE_EXAMPLES']):
-        bld.recurse('examples')
-
-    bld.ns3_python_bindings()
diff --git a/src/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc
index 91c5b8a9c..d946509d4 100644
--- a/src/uan/examples/uan-cw-example.cc
+++ b/src/uan/examples/uan-cw-example.cc
@@ -40,7 +40,7 @@
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/applications-module.h"
 
 #include <fstream>
diff --git a/src/uan/examples/uan-cw-example.h b/src/uan/examples/uan-cw-example.h
index a37fb0bf9..f5affb2cd 100644
--- a/src/uan/examples/uan-cw-example.h
+++ b/src/uan/examples/uan-cw-example.h
@@ -22,7 +22,7 @@
 #define UAN_CW_EXAMPLE_H
 
 #include "ns3/network-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/uan-module.h"
 
 using namespace ns3;
diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc
index cdfbf154c..b45fa0cc9 100644
--- a/src/uan/examples/uan-rc-example.cc
+++ b/src/uan/examples/uan-rc-example.cc
@@ -59,7 +59,7 @@
 #include "ns3/log.h"
 #include "ns3/config.h"
 #include "ns3/callback.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 
 #include <fstream>
 
diff --git a/src/uan/examples/uan-rc-example.h b/src/uan/examples/uan-rc-example.h
index 9520acf68..d9ab1e236 100644
--- a/src/uan/examples/uan-rc-example.h
+++ b/src/uan/examples/uan-rc-example.h
@@ -22,7 +22,7 @@
 #define UAN_RC_EXAMPLE_H
 
 #include "ns3/network-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/uan-module.h"
 
 using namespace ns3;
diff --git a/src/uan/examples/wscript b/src/uan/examples/wscript
index 8f1437be0..554f7642f 100644
--- a/src/uan/examples/wscript
+++ b/src/uan/examples/wscript
@@ -1,8 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('uan-cw-example', ['internet', 'mobility', 'tools', 'applications', 'uan'])
+    obj = bld.create_ns3_program('uan-cw-example', ['internet', 'mobility', 'stats', 'applications', 'uan'])
     obj.source = 'uan-cw-example.cc'
 
-    obj = bld.create_ns3_program('uan-rc-example', ['internet', 'mobility', 'tools', 'applications', 'uan'])
+    obj = bld.create_ns3_program('uan-rc-example', ['internet', 'mobility', 'stats', 'applications', 'uan'])
     obj.source = 'uan-rc-example.cc'