diff --git a/examples/csma/wscript b/examples/csma/wscript
index 6dd0a867d..9232bed4d 100644
--- a/examples/csma/wscript
+++ b/examples/csma/wscript
@@ -4,12 +4,6 @@ def build(bld):
     obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet-stack'])
     obj.source = 'csma-one-subnet.cc'
 
-    obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet-stack'])
-    obj.source = 'csma-bridge.cc'
-
-    obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet-stack'])
-    obj.source = 'csma-bridge-one-hop.cc'
-
     obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet-stack'])
     obj.source = 'csma-broadcast.cc'
 
diff --git a/examples/csma/csma-bridge-one-hop.cc b/src/devices/bridge/examples/csma-bridge-one-hop.cc
similarity index 100%
rename from examples/csma/csma-bridge-one-hop.cc
rename to src/devices/bridge/examples/csma-bridge-one-hop.cc
diff --git a/examples/csma/csma-bridge.cc b/src/devices/bridge/examples/csma-bridge.cc
similarity index 100%
rename from examples/csma/csma-bridge.cc
rename to src/devices/bridge/examples/csma-bridge.cc
diff --git a/examples/csma/csma-bridge.py b/src/devices/bridge/examples/csma-bridge.py
similarity index 100%
rename from examples/csma/csma-bridge.py
rename to src/devices/bridge/examples/csma-bridge.py
diff --git a/src/devices/bridge/examples/wscript b/src/devices/bridge/examples/wscript
new file mode 100644
index 000000000..045f36ce2
--- /dev/null
+++ b/src/devices/bridge/examples/wscript
@@ -0,0 +1,10 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+
+    obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet-stack'])
+    obj.source = 'csma-bridge.cc'
+
+    obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet-stack'])
+    obj.source = 'csma-bridge-one-hop.cc'
+
diff --git a/src/helper/bridge-helper.cc b/src/devices/bridge/helper/bridge-helper.cc
similarity index 100%
rename from src/helper/bridge-helper.cc
rename to src/devices/bridge/helper/bridge-helper.cc
diff --git a/src/helper/bridge-helper.h b/src/devices/bridge/helper/bridge-helper.h
similarity index 98%
rename from src/helper/bridge-helper.h
rename to src/devices/bridge/helper/bridge-helper.h
index 194dab38f..49af32974 100644
--- a/src/helper/bridge-helper.h
+++ b/src/devices/bridge/helper/bridge-helper.h
@@ -21,7 +21,7 @@
 #ifndef BRIDGE_HELPER_H
 #define BRIDGE_HELPER_H
 
-#include "net-device-container.h"
+#include "ns3/net-device-container.h"
 #include "ns3/object-factory.h"
 #include <string>
 
diff --git a/src/devices/bridge/bridge-channel.cc b/src/devices/bridge/model/bridge-channel.cc
similarity index 100%
rename from src/devices/bridge/bridge-channel.cc
rename to src/devices/bridge/model/bridge-channel.cc
diff --git a/src/devices/bridge/bridge-channel.h b/src/devices/bridge/model/bridge-channel.h
similarity index 100%
rename from src/devices/bridge/bridge-channel.h
rename to src/devices/bridge/model/bridge-channel.h
diff --git a/src/devices/bridge/bridge-net-device.cc b/src/devices/bridge/model/bridge-net-device.cc
similarity index 100%
rename from src/devices/bridge/bridge-net-device.cc
rename to src/devices/bridge/model/bridge-net-device.cc
diff --git a/src/devices/bridge/bridge-net-device.h b/src/devices/bridge/model/bridge-net-device.h
similarity index 100%
rename from src/devices/bridge/bridge-net-device.h
rename to src/devices/bridge/model/bridge-net-device.h
diff --git a/src/devices/bridge/wscript b/src/devices/bridge/wscript
index b0a13f0c4..3dde0ec75 100644
--- a/src/devices/bridge/wscript
+++ b/src/devices/bridge/wscript
@@ -3,12 +3,17 @@
 def build(bld):
     obj = bld.create_ns3_module('bridge', ['node'])
     obj.source = [
-        'bridge-net-device.cc',
-        'bridge-channel.cc',
+        'model/bridge-net-device.cc',
+        'model/bridge-channel.cc',
+        'helper/bridge-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'bridge'
     headers.source = [
-        'bridge-net-device.h',
-        'bridge-channel.h',
+        'model/bridge-net-device.h',
+        'model/bridge-channel.h',
+        'helper/bridge-helper.h',
         ]
+
+    if bld.env['ENABLE_EXAMPLES']:
+        bld.add_subdirs('examples')
diff --git a/src/helper/wscript b/src/helper/wscript
index 1369ef4ad..7d1034609 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -19,7 +19,6 @@ def build(bld):
         'packet-socket-helper.cc',
         'ipv4-interface-container.cc',
         'udp-echo-helper.cc',
-        'bridge-helper.cc',
         'yans-wifi-helper.cc',
         'spectrum-helper.cc',
         'adhoc-aloha-noack-ideal-phy-helper.cc',
@@ -74,7 +73,6 @@ def build(bld):
         'packet-socket-helper.h',
         'ipv4-interface-container.h',
         'udp-echo-helper.h',
-        'bridge-helper.h',
         'yans-wifi-helper.h',
         'spectrum-helper.h',
         'adhoc-aloha-noack-ideal-phy-helper.h',
diff --git a/test.py b/test.py
index f25266cdc..87235ad7b 100755
--- a/test.py
+++ b/test.py
@@ -189,7 +189,7 @@ example_tests = [
 # hardcoded.
 #
 python_tests = [
-    ("examples/csma/csma-bridge.py", "True"),
+    ("src/devices/bridge/examples/csma-bridge.py", "True"),
 
     ("src/contrib/flowmon/examples/wifi-olsr-flowmon.py", "True"),