Modularize stats module and move it to src

src/contrib/wscript

@@ -16,8 +16,6 @@ def configure(conf):
                                  "library 'libxml-2.0 >= 2.7' not found")
     conf.write_config_header('ns3/contrib-config.h', top=True)
 
-    conf.sub_config('stats')
-
 
 def build(bld):
     module = bld.create_ns3_module('contrib', ['core', 'network'])

src/stats/wscript

@@ -10,26 +10,26 @@ def configure(conf):
 def build(bld):
     obj = bld.create_ns3_module('stats', ['network'])
     obj.source = [
-        'data-calculator.cc',
-        'packet-data-calculators.cc',
-        'time-data-calculators.cc',
-        'data-output-interface.cc',
-        'omnet-data-output.cc',
-        'data-collector.cc',
+        'model/data-calculator.cc',
+        'model/packet-data-calculators.cc',
+        'model/time-data-calculators.cc',
+        'model/data-output-interface.cc',
+        'model/omnet-data-output.cc',
+        'model/data-collector.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'stats'
     headers.source = [
-        'data-calculator.h',
-        'packet-data-calculators.h',
-        'time-data-calculators.h',
-        'basic-data-calculators.h',
-        'data-output-interface.h',
-        'omnet-data-output.h',
-        'data-collector.h',
+        'model/data-calculator.h',
+        'model/packet-data-calculators.h',
+        'model/time-data-calculators.h',
+        'model/basic-data-calculators.h',
+        'model/data-output-interface.h',
+        'model/omnet-data-output.h',
+        'model/data-collector.h',
         ]
 
     if bld.env['SQLITE_STATS']:
-        headers.source.append('sqlite-data-output.h')
-        obj.source.append('sqlite-data-output.cc')
+        headers.source.append('model/sqlite-data-output.h')
+        obj.source.append('model/sqlite-data-output.cc')
         obj.uselib = 'SQLITE3'

src/wscript

@@ -38,7 +38,7 @@ all_modules = (
     'mobility',
     'wifi',
     'helper',
-    'contrib/stats',
+    'stats',
     'uan',
     'spectrum',
     'mesh',