diff --git a/examples/tunneling/waf b/examples/tunneling/waf
deleted file mode 100755
index 941d56b43..000000000
--- a/examples/tunneling/waf
+++ /dev/null
@@ -1 +0,0 @@
-exec "`dirname "$0"`"/../../waf "$@"
diff --git a/examples/tunneling/virtual-net-device.cc b/src/devices/virtual-net-device/examples/virtual-net-device.cc
similarity index 100%
rename from examples/tunneling/virtual-net-device.cc
rename to src/devices/virtual-net-device/examples/virtual-net-device.cc
diff --git a/examples/tunneling/wscript b/src/devices/virtual-net-device/examples/wscript
similarity index 98%
rename from examples/tunneling/wscript
rename to src/devices/virtual-net-device/examples/wscript
index 0ace2d5c6..e96f28178 100644
--- a/examples/tunneling/wscript
+++ b/src/devices/virtual-net-device/examples/wscript
@@ -1,6 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
+
     obj = bld.create_ns3_program('virtual-net-device', ['point-to-point', 'internet-stack', 'global-routing', 
                                                         'virtual-net-device'])
     obj.source = 'virtual-net-device.cc'
+    
diff --git a/src/devices/virtual-net-device/virtual-net-device.cc b/src/devices/virtual-net-device/model/virtual-net-device.cc
similarity index 100%
rename from src/devices/virtual-net-device/virtual-net-device.cc
rename to src/devices/virtual-net-device/model/virtual-net-device.cc
diff --git a/src/devices/virtual-net-device/virtual-net-device.h b/src/devices/virtual-net-device/model/virtual-net-device.h
similarity index 100%
rename from src/devices/virtual-net-device/virtual-net-device.h
rename to src/devices/virtual-net-device/model/virtual-net-device.h
diff --git a/src/devices/virtual-net-device/wscript b/src/devices/virtual-net-device/wscript
index f11b37c20..09d56dcf0 100644
--- a/src/devices/virtual-net-device/wscript
+++ b/src/devices/virtual-net-device/wscript
@@ -4,11 +4,13 @@
 def build(bld):
     module = bld.create_ns3_module('virtual-net-device', ['node'])
     module.source = [
-        'virtual-net-device.cc',
+        'model/virtual-net-device.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'virtual-net-device'
     headers.source = [
-        'virtual-net-device.h',
+        'model/virtual-net-device.h',
         ]
 
+    if bld.env['ENABLE_EXAMPLES']:
+        bld.add_subdirs('examples')