diff --git a/src/helper/dot11s-installer.cc b/src/dot11s/helper/dot11s-installer.cc
similarity index 100%
rename from src/helper/dot11s-installer.cc
rename to src/dot11s/helper/dot11s-installer.cc
diff --git a/src/helper/dot11s-installer.h b/src/dot11s/helper/dot11s-installer.h
similarity index 100%
rename from src/helper/dot11s-installer.h
rename to src/dot11s/helper/dot11s-installer.h
diff --git a/src/dot11s/wscript b/src/dot11s/wscript
index d695f510b..369993480 100644
--- a/src/dot11s/wscript
+++ b/src/dot11s/wscript
@@ -23,6 +23,7 @@ def build(bld):
         'model/hwmp-protocol-mac.cc',
         'model/hwmp-protocol.cc',
         'model/airtime-metric.cc',
+        'helper/dot11s-installer.cc',
         'test/dot11s-test-suite.cc',
         'test/pmp-regression.cc',
         'test/hwmp-reactive-regression.cc',
@@ -51,4 +52,5 @@ def build(bld):
         'model/ie-dot11s-prep.h',
         'model/ie-dot11s-preq.h',
         'model/ie-dot11s-rann.h',
+        'helper/dot11s-installer.h',
         ]
diff --git a/src/helper/flame-installer.cc b/src/flame/helper/flame-installer.cc
similarity index 100%
rename from src/helper/flame-installer.cc
rename to src/flame/helper/flame-installer.cc
diff --git a/src/helper/flame-installer.h b/src/flame/helper/flame-installer.h
similarity index 100%
rename from src/helper/flame-installer.h
rename to src/flame/helper/flame-installer.h
diff --git a/src/flame/wscript b/src/flame/wscript
index 502894b4f..68de7dbbc 100644
--- a/src/flame/wscript
+++ b/src/flame/wscript
@@ -7,6 +7,7 @@ def build(bld):
         'model/flame-rtable.cc',
         'model/flame-protocol-mac.cc',
         'model/flame-protocol.cc',
+        'helper/flame-installer.cc',
         'test/flame-test-suite.cc',
         'test/flame-regression.cc',
         'test/regression.cc',
@@ -18,4 +19,5 @@ def build(bld):
         'model/flame-header.h',
         'model/flame-rtable.h',
         'model/flame-protocol-mac.h',
+        'helper/flame-installer.h',
         ]
diff --git a/src/helper/wscript b/src/helper/wscript
index ab4af0154..0e9087b93 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -3,9 +3,6 @@
 def build(bld):
     helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'spectrum'])
     helper.source = [
-        'mesh-helper.cc',
-        'dot11s-installer.cc',
-        'flame-installer.cc',
         'athstats-helper.cc',
         'animation-interface.cc',
         'canvas-location.cc',
@@ -15,10 +12,6 @@ def build(bld):
     headers = bld.new_task_gen('ns3header')
     headers.module = 'helper'
     headers.source = [
-        'mesh-helper.h',
-        'mesh-stack-installer.h',
-        'dot11s-installer.h',
-        'flame-installer.h',
         'athstats-helper.h',
         'animation-interface.h',
         'canvas-location.h',
diff --git a/examples/mesh/mesh.cc b/src/mesh/examples/mesh.cc
similarity index 100%
rename from examples/mesh/mesh.cc
rename to src/mesh/examples/mesh.cc
diff --git a/examples/mesh/waf b/src/mesh/examples/waf
similarity index 100%
rename from examples/mesh/waf
rename to src/mesh/examples/waf
diff --git a/examples/mesh/wscript b/src/mesh/examples/wscript
similarity index 100%
rename from examples/mesh/wscript
rename to src/mesh/examples/wscript
diff --git a/src/helper/mesh-helper.cc b/src/mesh/helper/mesh-helper.cc
similarity index 100%
rename from src/helper/mesh-helper.cc
rename to src/mesh/helper/mesh-helper.cc
diff --git a/src/helper/mesh-helper.h b/src/mesh/helper/mesh-helper.h
similarity index 100%
rename from src/helper/mesh-helper.h
rename to src/mesh/helper/mesh-helper.h
diff --git a/src/helper/mesh-stack-installer.h b/src/mesh/helper/mesh-stack-installer.h
similarity index 100%
rename from src/helper/mesh-stack-installer.h
rename to src/mesh/helper/mesh-stack-installer.h
diff --git a/src/mesh/wscript b/src/mesh/wscript
index 50d057357..bb0d167b5 100644
--- a/src/mesh/wscript
+++ b/src/mesh/wscript
@@ -9,6 +9,7 @@ def build(bld):
         'model/mesh-l2-routing-protocol.cc',
         'model/mesh-wifi-beacon.cc',
         'model/mesh-wifi-interface-mac.cc',
+        'helper/mesh-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'mesh'
@@ -20,4 +21,9 @@ def build(bld):
         'model/mesh-wifi-beacon.h',
         'model/mesh-wifi-interface-mac.h',
         'model/mesh-wifi-interface-mac-plugin.h',
+        'helper/mesh-helper.h',
+        'helper/mesh-stack-installer.h',
         ]
+
+    if bld.env['ENABLE_EXAMPLES']:
+        bld.add_subdirs('examples')
diff --git a/test.py b/test.py
index d8c97a4a6..3e0527db2 100755
--- a/test.py
+++ b/test.py
@@ -114,7 +114,7 @@ example_tests = [
     ("examples/ipv6/radvd-two-prefix", "True", "True"),    
     ("examples/ipv6/test-ipv6", "True", "True"),
 
-    ("examples/mesh/mesh", "True", "True"),
+    ("src/mesh/examples/mesh", "True", "True"),
 
     ("examples/naming/object-names", "True", "True"),