diff --git a/examples/animation/wscript b/examples/animation/wscript
index 369b47629..f1cae9815 100644
--- a/examples/animation/wscript
+++ b/examples/animation/wscript
@@ -2,13 +2,13 @@
 
 def build(bld):
     obj = bld.create_ns3_program('dumbbell-animation',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'dumbbell-animation.cc'
 
     obj = bld.create_ns3_program('grid-animation',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'grid-animation.cc'
 
     obj = bld.create_ns3_program('star-animation',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'star-animation.cc'
diff --git a/examples/csma/wscript b/examples/csma/wscript
index 9232bed4d..71e4709df 100644
--- a/examples/csma/wscript
+++ b/examples/csma/wscript
@@ -1,23 +1,23 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet'])
     obj.source = 'csma-one-subnet.cc'
 
-    obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet'])
     obj.source = 'csma-broadcast.cc'
 
-    obj = bld.create_ns3_program('csma-packet-socket', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-packet-socket', ['csma', 'internet'])
     obj.source = 'csma-packet-socket.cc'
 
-    obj = bld.create_ns3_program('csma-multicast', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-multicast', ['csma', 'internet'])
     obj.source = 'csma-multicast.cc'
 
-    obj = bld.create_ns3_program('csma-star', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-star', ['csma', 'internet'])
     obj.source = 'csma-star.cc'
 
-    obj = bld.create_ns3_program('csma-raw-ip-socket', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-raw-ip-socket', ['csma', 'internet'])
     obj.source = 'csma-raw-ip-socket.cc'
 
-    obj = bld.create_ns3_program('csma-ping', ['csma', 'internet-stack', 'v4ping'])
+    obj = bld.create_ns3_program('csma-ping', ['csma', 'internet', 'v4ping'])
     obj.source = 'csma-ping.cc'
diff --git a/examples/emulation/wscript b/examples/emulation/wscript
index 70c42cb46..37ad28c82 100644
--- a/examples/emulation/wscript
+++ b/examples/emulation/wscript
@@ -3,8 +3,8 @@
 def build(bld):
     env = bld.env_of_name('default')
     if env['ENABLE_EMU']:
-        obj = bld.create_ns3_program('emu-udp-echo', ['emu', 'internet-stack'])
+        obj = bld.create_ns3_program('emu-udp-echo', ['emu', 'internet'])
         obj.source = 'emu-udp-echo.cc'
 
-        obj = bld.create_ns3_program('emu-ping', ['emu', 'internet-stack'])
+        obj = bld.create_ns3_program('emu-ping', ['emu', 'internet'])
         obj.source = 'emu-ping.cc'
diff --git a/examples/energy/wscript b/examples/energy/wscript
index b66442ff4..c5814b026 100644
--- a/examples/energy/wscript
+++ b/examples/energy/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('energy-model-example', ['core', 'mobility', 'wifi', 'energy', 'internet-stack'])
+    obj = bld.create_ns3_program('energy-model-example', ['core', 'mobility', 'wifi', 'energy', 'internet'])
     obj.source = 'energy-model-example.cc'
diff --git a/examples/error-model/wscript b/examples/error-model/wscript
index a058ec454..e45f31421 100644
--- a/examples/error-model/wscript
+++ b/examples/error-model/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('simple-error-model', ['point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('simple-error-model', ['point-to-point', 'internet'])
     obj.source = 'simple-error-model.cc'
diff --git a/examples/ipv6/fragmentation-ipv6.cc b/examples/ipv6/fragmentation-ipv6.cc
index 819a622fb..cca7ece30 100644
--- a/examples/ipv6/fragmentation-ipv6.cc
+++ b/examples/ipv6/fragmentation-ipv6.cc
@@ -30,7 +30,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-static-routing-helper.h"
 
diff --git a/examples/ipv6/icmpv6-redirect.cc b/examples/ipv6/icmpv6-redirect.cc
index 231e6285f..5d76c95e2 100644
--- a/examples/ipv6/icmpv6-redirect.cc
+++ b/examples/ipv6/icmpv6-redirect.cc
@@ -42,7 +42,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-static-routing-helper.h"
 
diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc
index e7332fc3d..b81447b20 100644
--- a/examples/ipv6/loose-routing-ipv6.cc
+++ b/examples/ipv6/loose-routing-ipv6.cc
@@ -40,7 +40,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-header.h"
 using namespace ns3;
diff --git a/examples/ipv6/ping6.cc b/examples/ipv6/ping6.cc
index 1a099aa0b..2de797ddd 100644
--- a/examples/ipv6/ping6.cc
+++ b/examples/ipv6/ping6.cc
@@ -31,7 +31,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 
 using namespace ns3;
diff --git a/examples/ipv6/radvd-two-prefix.cc b/examples/ipv6/radvd-two-prefix.cc
index 91048a74d..acffb9790 100644
--- a/examples/ipv6/radvd-two-prefix.cc
+++ b/examples/ipv6/radvd-two-prefix.cc
@@ -34,7 +34,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 
 #include "ns3/ipv6-routing-table-entry.h"
diff --git a/examples/ipv6/radvd.cc b/examples/ipv6/radvd.cc
index e5f57897d..a3380ae3e 100644
--- a/examples/ipv6/radvd.cc
+++ b/examples/ipv6/radvd.cc
@@ -33,7 +33,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 
 #include "ns3/radvd.h"
diff --git a/examples/ipv6/wscript b/examples/ipv6/wscript
index e7efcacd2..17729ecde 100644
--- a/examples/ipv6/wscript
+++ b/examples/ipv6/wscript
@@ -1,24 +1,24 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet'])
     obj.source = 'icmpv6-redirect.cc'
 
-    obj = bld.create_ns3_program('ping6', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('ping6', ['csma', 'internet'])
     obj.source = 'ping6.cc'
     
-    obj = bld.create_ns3_program('radvd', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('radvd', ['csma', 'internet'])
     obj.source = 'radvd.cc'
 
-    obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet'])
     obj.source = 'radvd-two-prefix.cc'
 
-    obj = bld.create_ns3_program('test-ipv6', ['point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('test-ipv6', ['point-to-point', 'internet'])
     obj.source = 'test-ipv6.cc'
     
-    obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet'])
     obj.source = 'fragmentation-ipv6.cc'
 
-    obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet'])
     obj.source = 'loose-routing-ipv6.cc'
 
diff --git a/examples/matrix-topology/wscript b/examples/matrix-topology/wscript
index 4216e3d45..2c4ade36c 100644
--- a/examples/matrix-topology/wscript
+++ b/examples/matrix-topology/wscript
@@ -2,5 +2,5 @@
 
 def build(bld):
     obj = bld.create_ns3_program('matrix-topology',
-                                 ['simulator', 'common', 'node', 'internet-stack'])
+                                 ['simulator', 'common', 'node', 'internet'])
     obj.source = 'matrix-topology.cc'
diff --git a/examples/mesh/mesh.cc b/examples/mesh/mesh.cc
index 259a9eefd..82a326527 100644
--- a/examples/mesh/mesh.cc
+++ b/examples/mesh/mesh.cc
@@ -45,10 +45,9 @@
 
 
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/network-module.h"
 #include "ns3/helper-module.h"
-#include "ns3/global-routing-module.h"
 #include "ns3/wifi-module.h"
 #include "ns3/mesh-module.h"
 #include "ns3/mobility-module.h"
diff --git a/examples/mpi/nms-p2p-nix-distributed.cc b/examples/mpi/nms-p2p-nix-distributed.cc
index 8b148abf4..5e23949e1 100644
--- a/examples/mpi/nms-p2p-nix-distributed.cc
+++ b/examples/mpi/nms-p2p-nix-distributed.cc
@@ -39,10 +39,9 @@
 #include <fstream>
 
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/network-module.h"
 #include "ns3/helper-module.h"
-#include "ns3/global-routing-module.h"
 #include "ns3/onoff-application.h"
 #include "ns3/packet-sink.h"
 #include "ns3/point-to-point-net-device.h"
diff --git a/examples/mpi/wscript b/examples/mpi/wscript
index 82b530b51..ee0250f7f 100644
--- a/examples/mpi/wscript
+++ b/examples/mpi/wscript
@@ -2,13 +2,13 @@
 
 def build(bld):
     obj = bld.create_ns3_program('simple-distributed',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'simple-distributed.cc'
 
     obj = bld.create_ns3_program('third-distributed',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'third-distributed.cc'
 
     obj = bld.create_ns3_program('nms-p2p-nix-distributed',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'nms-p2p-nix-distributed.cc'
diff --git a/examples/naming/wscript b/examples/naming/wscript
index 188cb9d3d..40f88df23 100644
--- a/examples/naming/wscript
+++ b/examples/naming/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet'])
     obj.source = 'object-names.cc'
diff --git a/examples/realtime/wscript b/examples/realtime/wscript
index e82688730..bd2b4e569 100644
--- a/examples/realtime/wscript
+++ b/examples/realtime/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('realtime-udp-echo', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('realtime-udp-echo', ['csma', 'internet'])
     obj.source = 'realtime-udp-echo.cc'
diff --git a/examples/routing/nms-p2p-nix.cc b/examples/routing/nms-p2p-nix.cc
index e68b630bd..a45b75f28 100644
--- a/examples/routing/nms-p2p-nix.cc
+++ b/examples/routing/nms-p2p-nix.cc
@@ -37,10 +37,9 @@
 #include <fstream>
 
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/network-module.h"
 #include "ns3/helper-module.h"
-#include "ns3/global-routing-module.h"
 #include "ns3/onoff-application.h"
 #include "ns3/packet-sink.h"
 #include "ns3/point-to-point-net-device.h"
diff --git a/examples/routing/simple-routing-ping6.cc b/examples/routing/simple-routing-ping6.cc
index cbbee0be5..12dff1d7a 100644
--- a/examples/routing/simple-routing-ping6.cc
+++ b/examples/routing/simple-routing-ping6.cc
@@ -30,7 +30,7 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/ipv6-static-routing-helper.h"
 
diff --git a/examples/routing/wscript b/examples/routing/wscript
index dcaf22d8a..d75502da7 100644
--- a/examples/routing/wscript
+++ b/examples/routing/wscript
@@ -2,45 +2,45 @@
 
 def build(bld):
     obj = bld.create_ns3_program('dynamic-global-routing',
-                                 ['point-to-point', 'csma', 'internet-stack', 'global-routing'])
+                                 ['point-to-point', 'csma', 'internet'])
     obj.source = 'dynamic-global-routing.cc'
 
     obj = bld.create_ns3_program('static-routing-slash32',
-                                 ['point-to-point', 'internet-stack', 'global-routing'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'static-routing-slash32.cc'
 
     obj = bld.create_ns3_program('global-routing-slash32',
-                                 ['point-to-point', 'internet-stack', 'global-routing'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'global-routing-slash32.cc'
 
     obj = bld.create_ns3_program('global-injection-slash32',
-                                 ['point-to-point', 'internet-stack', 'global-routing'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'global-injection-slash32.cc'
 
     obj = bld.create_ns3_program('simple-global-routing',
-                                 ['point-to-point', 'internet-stack', 'global-routing'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'simple-global-routing.cc'
 
     obj = bld.create_ns3_program('simple-alternate-routing',
-                                 ['point-to-point', 'internet-stack', 'global-routing'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'simple-alternate-routing.cc'
 
     obj = bld.create_ns3_program( 'mixed-global-routing',
-                                  ['point-to-point', 'internet-stack', 'global-routing' , 'csma-cd'])
+                                  ['point-to-point', 'internet', 'csma'])
     obj.source = 'mixed-global-routing.cc'
 
     obj = bld.create_ns3_program('nix-simple',
-                                 ['point-to-point', 'internet-stack', 'nix-vector-routing'])
+                                 ['point-to-point', 'internet', 'nix-vector-routing'])
     obj.source = 'nix-simple.cc'
 
     obj = bld.create_ns3_program('nms-p2p-nix',
-                                 ['point-to-point', 'internet-stack', 'nix-vector-routing'])
+                                 ['point-to-point', 'internet', 'nix-vector-routing'])
     obj.source = 'nms-p2p-nix.cc'
 
     obj = bld.create_ns3_program('simple-routing-ping6',
-      ['csma', 'internet-stack'])
+      ['csma', 'internet'])
     obj.source = 'simple-routing-ping6.cc'
     
     obj = bld.create_ns3_program('aodv',
-                                 ['wifi', 'internet-stack', 'aodv'])
+                                 ['wifi', 'internet', 'aodv'])
     obj.source = 'aodv.cc'
diff --git a/examples/socket/wscript b/examples/socket/wscript
index c95aa9ca5..a1e03d837 100644
--- a/examples/socket/wscript
+++ b/examples/socket/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('socket-bound-static-routing', ['node', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('socket-bound-static-routing', ['node', 'csma', 'internet'])
     obj.source = 'socket-bound-static-routing.cc'
 
-    obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['node', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['node', 'csma', 'internet'])
     obj.source = 'socket-bound-tcp-static-routing.cc'
diff --git a/examples/stats/wifi-example-apps.cc b/examples/stats/wifi-example-apps.cc
index 3cdb39473..c52830824 100644
--- a/examples/stats/wifi-example-apps.cc
+++ b/examples/stats/wifi-example-apps.cc
@@ -29,8 +29,7 @@
 
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
-#include "ns3/network-module.h"
-#include "ns3/internet-stack-module.h"
+#include "ns3/internet-module.h"
 
 #include "ns3/stats-module.h"
 
diff --git a/examples/tap/wscript b/examples/tap/wscript
index 6e9da3626..c8ab1ecd6 100644
--- a/examples/tap/wscript
+++ b/examples/tap/wscript
@@ -3,11 +3,11 @@
 def build(bld):
     env = bld.env_of_name('default')
     if env['ENABLE_TAP']:
-        obj = bld.create_ns3_program('tap-csma', ['csma', 'tap-bridge', 'internet-stack'])
+        obj = bld.create_ns3_program('tap-csma', ['csma', 'tap-bridge', 'internet'])
         obj.source = 'tap-csma.cc'
-        obj = bld.create_ns3_program('tap-csma-virtual-machine', ['csma', 'tap-bridge', 'internet-stack'])
+        obj = bld.create_ns3_program('tap-csma-virtual-machine', ['csma', 'tap-bridge', 'internet'])
         obj.source = 'tap-csma-virtual-machine.cc'
-        obj = bld.create_ns3_program('tap-wifi-virtual-machine', ['csma', 'tap-bridge', 'internet-stack'])
+        obj = bld.create_ns3_program('tap-wifi-virtual-machine', ['csma', 'tap-bridge', 'internet'])
         obj.source = 'tap-wifi-virtual-machine.cc'
-        obj = bld.create_ns3_program('tap-wifi-dumbbell', ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet-stack'])
+        obj = bld.create_ns3_program('tap-wifi-dumbbell', ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet'])
         obj.source = 'tap-wifi-dumbbell.cc'
diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc
index b1b0e6388..390058bff 100644
--- a/examples/tcp/tcp-large-transfer.cc
+++ b/examples/tcp/tcp-large-transfer.cc
@@ -39,8 +39,7 @@
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/network-module.h"
-#include "ns3/internet-stack-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/ipv4-global-routing-helper.h"
 
 using namespace ns3;
diff --git a/examples/tcp/wscript b/examples/tcp/wscript
index ebe5e1d24..3b80d96b5 100644
--- a/examples/tcp/wscript
+++ b/examples/tcp/wscript
@@ -2,25 +2,25 @@
 
 def build(bld):
     obj = bld.create_ns3_program('tcp-large-transfer',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'tcp-large-transfer.cc'
 
     obj = bld.create_ns3_program('tcp-nsc-lfn',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'tcp-nsc-lfn.cc'
 
     obj = bld.create_ns3_program('tcp-nsc-zoo',
-                                 ['csma', 'internet-stack'])
+                                 ['csma', 'internet'])
     obj.source = 'tcp-nsc-zoo.cc'
 
     obj = bld.create_ns3_program('tcp-star-server',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'tcp-star-server.cc'
 
     obj = bld.create_ns3_program('star',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'star.cc'
 
     obj = bld.create_ns3_program('tcp-bulk-send',
-                                 ['point-to-point', 'internet-stack'])
+                                 ['point-to-point', 'internet'])
     obj.source = 'tcp-bulk-send.cc'
diff --git a/examples/topology-read/wscript b/examples/topology-read/wscript
index 2595b4065..162df44ec 100644
--- a/examples/topology-read/wscript
+++ b/examples/topology-read/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('topology-read', ['topology-read', 'internet-stack'])
+    obj = bld.create_ns3_program('topology-read', ['topology-read', 'internet'])
     obj.source = 'topology-example-sim.cc'
diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc
index fc565af8e..437325643 100644
--- a/examples/tutorial/fifth.cc
+++ b/examples/tutorial/fifth.cc
@@ -17,7 +17,7 @@
 #include <fstream>
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
-#include "ns3/internet-stack-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 
 using namespace ns3;
diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc
index 5a9e89592..eded0005f 100644
--- a/examples/tutorial/sixth.cc
+++ b/examples/tutorial/sixth.cc
@@ -17,7 +17,7 @@
 #include <fstream>
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
-#include "ns3/internet-stack-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/helper-module.h"
 
 using namespace ns3;
diff --git a/examples/tutorial/wscript b/examples/tutorial/wscript
index 4e240e1a1..303d05288 100644
--- a/examples/tutorial/wscript
+++ b/examples/tutorial/wscript
@@ -4,20 +4,20 @@ def build(bld):
     obj = bld.create_ns3_program('hello-simulator', ['core'])
     obj.source = 'hello-simulator.cc'
         
-    obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet'])
     obj.source = 'first.cc'
         
-    obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet'])
     obj.source = 'second.cc'
         
-    obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet-stack'])
+    obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet'])
     obj.source = 'third.cc'
 
     obj = bld.create_ns3_program('fourth', ['core'])
     obj.source = 'fourth.cc'
 
-    obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet'])
     obj.source = 'fifth.cc'
 
-    obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet-stack'])
+    obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet'])
     obj.source = 'sixth.cc'
diff --git a/examples/udp-client-server/wscript b/examples/udp-client-server/wscript
index 9a7815c0b..932c8cdde 100644
--- a/examples/udp-client-server/wscript
+++ b/examples/udp-client-server/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('udp-client-server', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('udp-client-server', ['csma', 'internet'])
     obj.source = 'udp-client-server.cc'
     
-    obj = bld.create_ns3_program('udp-trace-client-server', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('udp-trace-client-server', ['csma', 'internet'])
     obj.source = 'udp-trace-client-server.cc'
diff --git a/examples/udp/wscript b/examples/udp/wscript
index ede60f5bb..6cb234a83 100644
--- a/examples/udp/wscript
+++ b/examples/udp/wscript
@@ -1,5 +1,5 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('udp-echo', ['csma', 'internet-stack'])
+    obj = bld.create_ns3_program('udp-echo', ['csma', 'internet'])
     obj.source = 'udp-echo.cc'
diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc
index 758621cdd..8d4a77d54 100644
--- a/examples/wireless/wifi-blockack.cc
+++ b/examples/wireless/wifi-blockack.cc
@@ -40,10 +40,9 @@
  *    - the recipient receives a block ack request or a MPDU with ack policy Block Ack. 
  */
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/network-module.h"
 #include "ns3/helper-module.h"
-#include "ns3/global-routing-module.h"
 #include "ns3/wifi-module.h"
 #include "ns3/mobility-module.h"
 
diff --git a/examples/wireless/wscript b/examples/wireless/wscript
index cf3d4663a..48c5bb99e 100644
--- a/examples/wireless/wscript
+++ b/examples/wireless/wscript
@@ -2,7 +2,7 @@
 
 def build(bld):
     obj = bld.create_ns3_program('mixed-wireless', ['core', 'mobility', 'wifi', 'point-to-point', 
-                                                    'internet-stack'])
+                                                    'internet'])
     obj.source = 'mixed-wireless.cc'
 
     obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi'])
diff --git a/samples/wscript b/samples/wscript
index d67242b75..b2d373dc8 100644
--- a/samples/wscript
+++ b/samples/wscript
@@ -31,11 +31,11 @@ def build(bld):
         obj.source = 'main-test-sync.cc'
 
     obj = bld.create_ns3_program('main-simple',
-                                 ['node', 'internet-stack', 'onoff'])
+                                 ['node', 'internet', 'onoff'])
     obj.source = 'main-simple.cc'
 
     obj = bld.create_ns3_program('main-grid-topology',
-                                 ['core', 'mobility', 'internet-stack'])
+                                 ['core', 'mobility', 'internet'])
     obj.source = 'main-grid-topology.cc'
 
     obj = bld.create_ns3_program('main-random-topology',
diff --git a/src/applications/ping6/wscript b/src/applications/ping6/wscript
index 2aebe2afd..7e1600183 100644
--- a/src/applications/ping6/wscript
+++ b/src/applications/ping6/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('ping6', ['internet-stack'])
+    module = bld.create_ns3_module('ping6', ['internet'])
     module.source = [
         'ping6.cc',
         ]
diff --git a/src/applications/radvd/wscript b/src/applications/radvd/wscript
index 63cdcd903..91129aad5 100644
--- a/src/applications/radvd/wscript
+++ b/src/applications/radvd/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('radvd', ['internet-stack'])
+    module = bld.create_ns3_module('radvd', ['internet'])
     module.source = [
         'radvd.cc',
         'radvd-interface.cc',
diff --git a/src/applications/udp-client-server/wscript b/src/applications/udp-client-server/wscript
index 6d40e8a12..f5be1ad4f 100644
--- a/src/applications/udp-client-server/wscript
+++ b/src/applications/udp-client-server/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('udp-client-server', ['internet-stack'])
+    module = bld.create_ns3_module('udp-client-server', ['internet'])
     module.source = [
         'udp-client.cc',
         'udp-server.cc',
diff --git a/src/applications/udp-echo/wscript b/src/applications/udp-echo/wscript
index 4c27c517b..4fe44788f 100644
--- a/src/applications/udp-echo/wscript
+++ b/src/applications/udp-echo/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('udp-echo', ['internet-stack'])
+    module = bld.create_ns3_module('udp-echo', ['internet'])
     module.source = [
         'udp-echo-client.cc',
         'udp-echo-server.cc',
diff --git a/src/contrib/flow-monitor/wscript b/src/contrib/flow-monitor/wscript
index bf3936661..733724a3c 100644
--- a/src/contrib/flow-monitor/wscript
+++ b/src/contrib/flow-monitor/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('flow-monitor', ['internet-stack'])
+    obj = bld.create_ns3_module('flow-monitor', ['internet'])
     obj.source = ["model/%s" % s for s in [
        'flow-monitor.cc',
        'flow-classifier.cc',
diff --git a/src/devices/bridge/examples/wscript b/src/devices/bridge/examples/wscript
index 045f36ce2..906b5cfa5 100644
--- a/src/devices/bridge/examples/wscript
+++ b/src/devices/bridge/examples/wscript
@@ -2,9 +2,9 @@
 
 def build(bld):
 
-    obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet'])
     obj.source = 'csma-bridge.cc'
 
-    obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet-stack'])
+    obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet'])
     obj.source = 'csma-bridge-one-hop.cc'
 
diff --git a/src/devices/virtual-net-device/examples/wscript b/src/devices/virtual-net-device/examples/wscript
index e96f28178..527a5a8e5 100644
--- a/src/devices/virtual-net-device/examples/wscript
+++ b/src/devices/virtual-net-device/examples/wscript
@@ -2,7 +2,7 @@
 
 def build(bld):
 
-    obj = bld.create_ns3_program('virtual-net-device', ['point-to-point', 'internet-stack', 'global-routing', 
+    obj = bld.create_ns3_program('virtual-net-device', ['point-to-point', 'internet', 'global-routing', 
                                                         'virtual-net-device'])
     obj.source = 'virtual-net-device.cc'
     
diff --git a/src/helper/aodv-helper.h b/src/helper/aodv-helper.h
index 0bc70b4c5..3a9e663b0 100644
--- a/src/helper/aodv-helper.h
+++ b/src/helper/aodv-helper.h
@@ -23,7 +23,7 @@
 #include "ns3/object-factory.h"
 #include "ns3/node.h"
 #include "ns3/node-container.h"
-#include "ipv4-routing-helper.h"
+#include "ns3/ipv4-routing-helper.h"
 
 namespace ns3
 {
diff --git a/src/helper/csma-helper.cc b/src/helper/csma-helper.cc
index 821705d8a..3c2afb201 100644
--- a/src/helper/csma-helper.cc
+++ b/src/helper/csma-helper.cc
@@ -29,7 +29,7 @@
 #include "ns3/packet.h"
 #include "ns3/names.h"
 
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 #include "csma-helper.h"
 
 #include <string>
diff --git a/src/helper/csma-helper.h b/src/helper/csma-helper.h
index e35e58ac0..27ae317f0 100644
--- a/src/helper/csma-helper.h
+++ b/src/helper/csma-helper.h
@@ -28,7 +28,7 @@
 #include "ns3/node-container.h"
 #include "ns3/csma-channel.h"
 #include "ns3/deprecated.h"
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 
 namespace ns3 {
 
diff --git a/src/helper/emu-helper.cc b/src/helper/emu-helper.cc
index 9f93a891b..7cc979e9b 100644
--- a/src/helper/emu-helper.cc
+++ b/src/helper/emu-helper.cc
@@ -27,7 +27,7 @@
 #include "ns3/config.h"
 #include "ns3/packet.h"
 
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 #include "emu-helper.h"
 
 NS_LOG_COMPONENT_DEFINE ("EmuHelper");
diff --git a/src/helper/emu-helper.h b/src/helper/emu-helper.h
index 46ca247f3..2dec42569 100644
--- a/src/helper/emu-helper.h
+++ b/src/helper/emu-helper.h
@@ -28,7 +28,7 @@
 #include "ns3/node-container.h"
 #include "ns3/emu-net-device.h"
 
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 
 namespace ns3 {
 
diff --git a/src/helper/point-to-point-helper.cc b/src/helper/point-to-point-helper.cc
index bc0f9a6d8..b43b7b928 100644
--- a/src/helper/point-to-point-helper.cc
+++ b/src/helper/point-to-point-helper.cc
@@ -30,7 +30,7 @@
 #include "ns3/names.h"
 #include "ns3/mpi-interface.h"
 
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 #include "point-to-point-helper.h"
 
 NS_LOG_COMPONENT_DEFINE ("PointToPointHelper");
diff --git a/src/helper/point-to-point-helper.h b/src/helper/point-to-point-helper.h
index 4012fb4bc..15fa39846 100644
--- a/src/helper/point-to-point-helper.h
+++ b/src/helper/point-to-point-helper.h
@@ -27,7 +27,7 @@
 #include "ns3/node-container.h"
 #include "ns3/deprecated.h"
 
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 
 namespace ns3 {
 
diff --git a/src/helper/wifi-helper.h b/src/helper/wifi-helper.h
index a079d0f63..9e3d632d1 100644
--- a/src/helper/wifi-helper.h
+++ b/src/helper/wifi-helper.h
@@ -28,7 +28,7 @@
 #include "ns3/node-container.h"
 #include "ns3/net-device-container.h"
 #include "ns3/wifi-phy-standard.h"
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 
 namespace ns3 {
 
diff --git a/src/helper/wimax-helper.h b/src/helper/wimax-helper.h
index d09e39880..ec1348d7f 100644
--- a/src/helper/wimax-helper.h
+++ b/src/helper/wimax-helper.h
@@ -39,7 +39,7 @@
 #include "ns3/bs-scheduler.h"
 #include "ns3/bs-scheduler-simple.h"
 #include "ns3/bs-scheduler-rtps.h"
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 
 namespace ns3 {
 
diff --git a/src/helper/wscript b/src/helper/wscript
index 432c88116..e81285919 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -1,33 +1,26 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
+    helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
     helper.source = [
         'wifi-helper.cc',
         'point-to-point-helper.cc',
         'csma-helper.cc',
         'mobility-helper.cc',
         'ns2-mobility-helper.cc',
-        'ipv4-address-helper.cc',
-        'internet-stack-helper.cc',
         'on-off-helper.cc',
         'packet-sink-helper.cc',
-        'ipv4-interface-container.cc',
         'udp-echo-helper.cc',
         'yans-wifi-helper.cc',
         'v4ping-helper.cc',
         'nqos-wifi-mac-helper.cc',
         'qos-wifi-mac-helper.cc',
         'ipv4-nix-vector-helper.cc',
-        'ipv4-routing-helper.cc',
         'aodv-helper.cc',
         'mesh-helper.cc',
         'dot11s-installer.cc',
         'flame-installer.cc',
         'athstats-helper.cc',
-        'ipv6-address-helper.cc',
-        'ipv6-interface-container.cc',
-        'ipv6-routing-helper.cc',
         'ping6-helper.cc',
         'animation-interface.cc',
         'canvas-location.cc',
@@ -36,7 +29,6 @@ def build(bld):
         'point-to-point-star-helper.cc',
         'csma-star-helper.cc',
         'udp-client-server-helper.cc',
-        'trace-helper.cc',
         'wimax-helper.cc',
         'topology-reader-helper.cc',
         'bulk-send-helper.cc',
@@ -50,27 +42,20 @@ def build(bld):
         'csma-helper.h',
         'mobility-helper.h',
         'ns2-mobility-helper.h',
-        'ipv4-address-helper.h',
-        'internet-stack-helper.h',
         'on-off-helper.h',
         'packet-sink-helper.h',
-        'ipv4-interface-container.h',
         'udp-echo-helper.h',
         'yans-wifi-helper.h',
         'v4ping-helper.h',
         'nqos-wifi-mac-helper.h',
         'qos-wifi-mac-helper.h',
         'ipv4-nix-vector-helper.h',
-        'ipv4-routing-helper.h',
         'aodv-helper.h',
         'mesh-helper.h',
         'mesh-stack-installer.h',
         'dot11s-installer.h',
         'flame-installer.h',
         'athstats-helper.h',
-        'ipv6-address-helper.h',
-        'ipv6-interface-container.h',
-        'ipv6-routing-helper.h',
         'ping6-helper.h',
         'animation-interface.h',
         'canvas-location.h',
@@ -79,7 +64,6 @@ def build(bld):
         'point-to-point-star-helper.h',
         'csma-star-helper.h',
         'udp-client-server-helper.h',
-        'trace-helper.h',
         'wimax-helper.h',
         'topology-reader-helper.h',
         'bulk-send-helper.h',
diff --git a/src/helper/yans-wifi-helper.cc b/src/helper/yans-wifi-helper.cc
index 79b219f97..8ac0d45fc 100644
--- a/src/helper/yans-wifi-helper.cc
+++ b/src/helper/yans-wifi-helper.cc
@@ -18,7 +18,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 #include "yans-wifi-helper.h"
 #include "ns3/error-rate-model.h"
 #include "ns3/propagation-loss-model.h"
diff --git a/src/helper/yans-wifi-helper.h b/src/helper/yans-wifi-helper.h
index f7ce13d36..7ba513a4d 100644
--- a/src/helper/yans-wifi-helper.h
+++ b/src/helper/yans-wifi-helper.h
@@ -21,7 +21,7 @@
 #define YANS_WIFI_HELPER_H
 
 #include "wifi-helper.h"
-#include "trace-helper.h"
+#include "ns3/trace-helper.h"
 #include "ns3/yans-wifi-channel.h"
 #include "ns3/deprecated.h"
 
diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript
deleted file mode 100644
index f0c918cb3..000000000
--- a/src/internet-stack/wscript
+++ /dev/null
@@ -1,222 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-import os
-import sys
-
-import Options
-import Logs
-import Utils
-import Task
-
-# Required NSC version
-NSC_RELEASE_NAME = "nsc-0.5.2"
-
-
-def set_options(opt):
-    opt.add_option('--with-nsc',
-                   help=('Use Network Simulation Cradle, given by the indicated path,'
-                         ' to allow the use of real-world network stacks'),
-                   default='', dest='with_nsc')
-
-
-def configure(conf):
-    conf.env['ENABLE_NSC'] = False
-
-    # checks for flex and bison, which is needed to build NSCs globaliser
-    # TODO: how to move these checks into the allinone scripts?
-    #def check_nsc_buildutils():
-    #    import flex
-    #    import bison
-    #    conf.check_tool('flex bison')
-    #    conf.check(lib='fl', mandatory=True)
-
-    # Check for the location of NSC
-    if Options.options.with_nsc:
-        if os.path.isdir(Options.options.with_nsc):
-            conf.check_message("NSC location", '', True, ("%s (given)" % Options.options.with_nsc))
-            conf.env['WITH_NSC'] = os.path.abspath(Options.options.with_nsc)
-    else:
-        # ns-3-dev uses ../nsc, while ns-3 releases use ../NSC_RELEASE_NAME
-        nsc_dir = os.path.join('..', "nsc")
-        nsc_release_dir = os.path.join('..', NSC_RELEASE_NAME)
-        if os.path.isdir(nsc_dir):
-            conf.check_message("NSC location", '', True, ("%s (guessed)" % nsc_dir))
-            conf.env['WITH_NSC'] = os.path.abspath(nsc_dir)
-        elif os.path.isdir(nsc_release_dir):
-            conf.check_message("NSC location", '', True, ("%s (guessed)" % nsc_release_dir))
-            conf.env['WITH_NSC'] = os.path.abspath(nsc_release_dir)
-        del nsc_dir
-        del nsc_release_dir
-
-    if not conf.env['WITH_NSC']:
-        conf.check_message("NSC location", '', False)
-        conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
-                                     "NSC not found (see option --with-nsc)")
-	return
-    
-    if sys.platform in ['linux2']:
-        arch = os.uname()[4]
-    else:
-        arch = None
-    ok = False
-    if arch in ('x86_64', 'i686', 'i586', 'i486', 'i386'):
-        conf.env['NSC_ENABLED'] = True
-        conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE')
-        conf.check(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
-        ok = True
-    conf.check_message('NSC supported architecture', arch, ok)
-    
-    if not ok:
-        conf.env['NSC_ENABLED'] = False
-        conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
-                                     "architecture %r not supported" % arch)
-        return
-
-    lib_to_check = 'liblinux2.6.26.so'
-
-    if not os.path.exists(os.path.join(conf.env['WITH_NSC'], lib_to_check)):
-        conf.env['NSC_ENABLED'] = False
-        conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
-            "NSC library %s is missing: NSC has not been built?" % lib_to_check)
-        return
-
-    # append the NSC kernel dirs to the module path so that these dirs
-    # will end up in the LD_LIBRARY_PATH, thus allowing the NSC NS-3
-    # module to find the necessary NSC shared libraries.
-    for nsc_module in ['linux-2.6.18', 'linux-2.6.26']:
-        conf.env.append_value('NS3_MODULE_PATH',
-                              os.path.abspath(os.path.join(conf.env['WITH_NSC'], nsc_module)))
-
-    conf.report_optional_feature("nsc", "Network Simulation Cradle", True, "")
-
-
-
-def build(bld):
-    obj = bld.create_ns3_module('internet-stack', ['network'])
-    obj.source = [
-        'tcp-test.cc',
-        'udp-test.cc',
-        'ipv4-test.cc',
-        'ipv4-raw-test.cc',
-        'ipv4-l4-protocol.cc',
-        'udp-header.cc',
-        'tcp-header.cc',
-        'ipv4-interface.cc',
-        'ipv4-l3-protocol.cc',
-        'ipv4-end-point.cc',
-        'udp-l4-protocol.cc',
-        'tcp-l4-protocol.cc',
-        'arp-header.cc',
-        'arp-cache.cc',
-        'arp-l3-protocol.cc',
-        'udp-socket-impl.cc',
-        'ipv4-end-point-demux.cc',
-        'udp-socket-factory-impl.cc',
-        'tcp-socket-factory-impl.cc',
-        'pending-data.cc',
-        'rtt-estimator.cc',
-        'ipv4-raw-socket-factory-impl.cc',
-        'ipv4-raw-socket-impl.cc',
-        'icmpv4.cc',
-        'icmpv4-l4-protocol.cc',
-        'loopback-net-device.cc',
-        'ndisc-cache.cc',
-        'ipv6-interface.cc',
-        'icmpv6-header.cc',
-        'ipv6-l3-protocol.cc',
-        'ipv6-end-point.cc',
-        'ipv6-end-point-demux.cc',
-        'ipv6-l4-protocol.cc',
-        'ipv6-raw-socket-factory-impl.cc',
-        'ipv6-raw-socket-impl.cc',
-        'ipv6-autoconfigured-prefix.cc',
-        'ipv6-extension.cc',
-        'ipv6-extension-header.cc',
-        'ipv6-extension-demux.cc',
-        'ipv6-option.cc',
-        'ipv6-option-header.cc',
-        'ipv6-option-demux.cc',
-        'icmpv6-l4-protocol.cc',
-        'ipv6-test.cc',
-        'ipv6-extension-header-test-suite.cc',
-        'tcp-socket-base.cc',
-        'tcp-rfc793.cc',
-        'tcp-tahoe.cc',
-        'tcp-reno.cc',
-        'tcp-newreno.cc',
-        'tcp-rx-buffer.cc',
-        'tcp-tx-buffer.cc',
-        'ipv4-packet-info-tag.cc',
-        'ipv6-packet-info-tag.cc',
-        'ipv4-interface-address.cc',
-        'ipv4-address-generator.cc',
-        'ipv4-header.cc',
-        'ipv4-route.cc',
-        'ipv4-routing-protocol.cc',
-        'udp-socket.cc',
-        'udp-socket-factory.cc',
-        'tcp-socket.cc',
-        'tcp-socket-factory.cc',
-        'ipv4.cc',
-        'ipv4-raw-socket-factory.cc',
-        'ipv6-header.cc',
-        'ipv6-interface-address.cc',
-        'ipv6-route.cc',
-        'ipv6.cc',
-        'ipv6-raw-socket-factory.cc',
-        'ipv6-routing-protocol.cc',
-        ]
-
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'internet-stack'
-    headers.source = [
-        'udp-header.h',
-        'tcp-header.h',
-        'icmpv4.h',
-        'icmpv6-header.h',
-        # used by routing
-        'ipv4-interface.h',
-        'ipv4-l3-protocol.h',
-        'ipv6-l3-protocol.h',
-        'ipv6-extension-header.h',
-        'ipv6-option-header.h',
-        'arp-l3-protocol.h',
-        'udp-l4-protocol.h',
-        'tcp-l4-protocol.h',
-        'icmpv4-l4-protocol.h',
-        'ipv4-l4-protocol.h',
-        'ipv4-raw-socket-impl.h',
-        'arp-header.h',
-        'arp-cache.h',
-        'icmpv6-l4-protocol.h',
-        'ipv6-l4-protocol.h',
-        'ipv6-interface.h',
-        'ndisc-cache.h',
-        'loopback-net-device.h',
-        'ipv4-packet-info-tag.h',
-        'ipv6-packet-info-tag.h',
-        'ipv4-interface-address.h',
-        'ipv4-address-generator.h',
-        'ipv4-header.h',
-        'ipv4-route.h',
-        'ipv4-routing-protocol.h',
-        'udp-socket.h',
-        'udp-socket-factory.h',
-        'tcp-socket.h',
-        'tcp-socket-factory.h',
-        'ipv4.h',
-        'ipv4-raw-socket-factory.h',
-        'ipv6-header.h',
-        'ipv6-interface-address.h',
-        'ipv6-route.h',
-        'ipv6.h',
-        'ipv6-raw-socket-factory.h',
-        'ipv6-routing-protocol.h',
-       ]
-
-    if bld.env['NSC_ENABLED']:
-        obj.source.append ('nsc-tcp-socket-impl.cc')
-        obj.source.append ('nsc-tcp-l4-protocol.cc')
-        obj.source.append ('nsc-tcp-socket-factory-impl.cc')
-        obj.source.append ('nsc-sysctl.cc')
-        headers.source.append('nsc-tcp-l4-protocol.h')
-        obj.uselib = 'DL'
diff --git a/src/helper/internet-stack-helper.cc b/src/internet/helper/internet-stack-helper.cc
similarity index 100%
rename from src/helper/internet-stack-helper.cc
rename to src/internet/helper/internet-stack-helper.cc
diff --git a/src/helper/internet-stack-helper.h b/src/internet/helper/internet-stack-helper.h
similarity index 100%
rename from src/helper/internet-stack-helper.h
rename to src/internet/helper/internet-stack-helper.h
diff --git a/src/helper/ipv4-address-helper.cc b/src/internet/helper/ipv4-address-helper.cc
similarity index 100%
rename from src/helper/ipv4-address-helper.cc
rename to src/internet/helper/ipv4-address-helper.cc
diff --git a/src/helper/ipv4-address-helper.h b/src/internet/helper/ipv4-address-helper.h
similarity index 100%
rename from src/helper/ipv4-address-helper.h
rename to src/internet/helper/ipv4-address-helper.h
diff --git a/src/routing/global-routing/helper/ipv4-global-routing-helper.cc b/src/internet/helper/ipv4-global-routing-helper.cc
similarity index 100%
rename from src/routing/global-routing/helper/ipv4-global-routing-helper.cc
rename to src/internet/helper/ipv4-global-routing-helper.cc
diff --git a/src/routing/global-routing/helper/ipv4-global-routing-helper.h b/src/internet/helper/ipv4-global-routing-helper.h
similarity index 100%
rename from src/routing/global-routing/helper/ipv4-global-routing-helper.h
rename to src/internet/helper/ipv4-global-routing-helper.h
diff --git a/src/helper/ipv4-interface-container.cc b/src/internet/helper/ipv4-interface-container.cc
similarity index 100%
rename from src/helper/ipv4-interface-container.cc
rename to src/internet/helper/ipv4-interface-container.cc
diff --git a/src/helper/ipv4-interface-container.h b/src/internet/helper/ipv4-interface-container.h
similarity index 100%
rename from src/helper/ipv4-interface-container.h
rename to src/internet/helper/ipv4-interface-container.h
diff --git a/src/routing/list-routing/helper/ipv4-list-routing-helper.cc b/src/internet/helper/ipv4-list-routing-helper.cc
similarity index 100%
rename from src/routing/list-routing/helper/ipv4-list-routing-helper.cc
rename to src/internet/helper/ipv4-list-routing-helper.cc
diff --git a/src/routing/list-routing/helper/ipv4-list-routing-helper.h b/src/internet/helper/ipv4-list-routing-helper.h
similarity index 100%
rename from src/routing/list-routing/helper/ipv4-list-routing-helper.h
rename to src/internet/helper/ipv4-list-routing-helper.h
diff --git a/src/helper/ipv4-routing-helper.cc b/src/internet/helper/ipv4-routing-helper.cc
similarity index 100%
rename from src/helper/ipv4-routing-helper.cc
rename to src/internet/helper/ipv4-routing-helper.cc
diff --git a/src/helper/ipv4-routing-helper.h b/src/internet/helper/ipv4-routing-helper.h
similarity index 100%
rename from src/helper/ipv4-routing-helper.h
rename to src/internet/helper/ipv4-routing-helper.h
diff --git a/src/routing/static-routing/helper/ipv4-static-routing-helper.cc b/src/internet/helper/ipv4-static-routing-helper.cc
similarity index 100%
rename from src/routing/static-routing/helper/ipv4-static-routing-helper.cc
rename to src/internet/helper/ipv4-static-routing-helper.cc
diff --git a/src/routing/static-routing/helper/ipv4-static-routing-helper.h b/src/internet/helper/ipv4-static-routing-helper.h
similarity index 100%
rename from src/routing/static-routing/helper/ipv4-static-routing-helper.h
rename to src/internet/helper/ipv4-static-routing-helper.h
diff --git a/src/helper/ipv6-address-helper.cc b/src/internet/helper/ipv6-address-helper.cc
similarity index 100%
rename from src/helper/ipv6-address-helper.cc
rename to src/internet/helper/ipv6-address-helper.cc
diff --git a/src/helper/ipv6-address-helper.h b/src/internet/helper/ipv6-address-helper.h
similarity index 100%
rename from src/helper/ipv6-address-helper.h
rename to src/internet/helper/ipv6-address-helper.h
diff --git a/src/helper/ipv6-interface-container.cc b/src/internet/helper/ipv6-interface-container.cc
similarity index 100%
rename from src/helper/ipv6-interface-container.cc
rename to src/internet/helper/ipv6-interface-container.cc
diff --git a/src/helper/ipv6-interface-container.h b/src/internet/helper/ipv6-interface-container.h
similarity index 100%
rename from src/helper/ipv6-interface-container.h
rename to src/internet/helper/ipv6-interface-container.h
diff --git a/src/routing/list-routing/helper/ipv6-list-routing-helper.cc b/src/internet/helper/ipv6-list-routing-helper.cc
similarity index 100%
rename from src/routing/list-routing/helper/ipv6-list-routing-helper.cc
rename to src/internet/helper/ipv6-list-routing-helper.cc
diff --git a/src/routing/list-routing/helper/ipv6-list-routing-helper.h b/src/internet/helper/ipv6-list-routing-helper.h
similarity index 100%
rename from src/routing/list-routing/helper/ipv6-list-routing-helper.h
rename to src/internet/helper/ipv6-list-routing-helper.h
diff --git a/src/helper/ipv6-routing-helper.cc b/src/internet/helper/ipv6-routing-helper.cc
similarity index 100%
rename from src/helper/ipv6-routing-helper.cc
rename to src/internet/helper/ipv6-routing-helper.cc
diff --git a/src/helper/ipv6-routing-helper.h b/src/internet/helper/ipv6-routing-helper.h
similarity index 100%
rename from src/helper/ipv6-routing-helper.h
rename to src/internet/helper/ipv6-routing-helper.h
diff --git a/src/routing/static-routing/helper/ipv6-static-routing-helper.cc b/src/internet/helper/ipv6-static-routing-helper.cc
similarity index 100%
rename from src/routing/static-routing/helper/ipv6-static-routing-helper.cc
rename to src/internet/helper/ipv6-static-routing-helper.cc
diff --git a/src/routing/static-routing/helper/ipv6-static-routing-helper.h b/src/internet/helper/ipv6-static-routing-helper.h
similarity index 100%
rename from src/routing/static-routing/helper/ipv6-static-routing-helper.h
rename to src/internet/helper/ipv6-static-routing-helper.h
diff --git a/src/helper/trace-helper.cc b/src/internet/helper/trace-helper.cc
similarity index 100%
rename from src/helper/trace-helper.cc
rename to src/internet/helper/trace-helper.cc
diff --git a/src/helper/trace-helper.h b/src/internet/helper/trace-helper.h
similarity index 100%
rename from src/helper/trace-helper.h
rename to src/internet/helper/trace-helper.h
diff --git a/src/internet-stack/arp-cache.cc b/src/internet/model/arp-cache.cc
similarity index 100%
rename from src/internet-stack/arp-cache.cc
rename to src/internet/model/arp-cache.cc
diff --git a/src/internet-stack/arp-cache.h b/src/internet/model/arp-cache.h
similarity index 100%
rename from src/internet-stack/arp-cache.h
rename to src/internet/model/arp-cache.h
diff --git a/src/internet-stack/arp-header.cc b/src/internet/model/arp-header.cc
similarity index 100%
rename from src/internet-stack/arp-header.cc
rename to src/internet/model/arp-header.cc
diff --git a/src/internet-stack/arp-header.h b/src/internet/model/arp-header.h
similarity index 100%
rename from src/internet-stack/arp-header.h
rename to src/internet/model/arp-header.h
diff --git a/src/internet-stack/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc
similarity index 100%
rename from src/internet-stack/arp-l3-protocol.cc
rename to src/internet/model/arp-l3-protocol.cc
diff --git a/src/internet-stack/arp-l3-protocol.h b/src/internet/model/arp-l3-protocol.h
similarity index 100%
rename from src/internet-stack/arp-l3-protocol.h
rename to src/internet/model/arp-l3-protocol.h
diff --git a/src/routing/global-routing/model/candidate-queue.cc b/src/internet/model/candidate-queue.cc
similarity index 100%
rename from src/routing/global-routing/model/candidate-queue.cc
rename to src/internet/model/candidate-queue.cc
diff --git a/src/routing/global-routing/model/candidate-queue.h b/src/internet/model/candidate-queue.h
similarity index 100%
rename from src/routing/global-routing/model/candidate-queue.h
rename to src/internet/model/candidate-queue.h
diff --git a/src/routing/global-routing/model/global-route-manager-impl.cc b/src/internet/model/global-route-manager-impl.cc
similarity index 100%
rename from src/routing/global-routing/model/global-route-manager-impl.cc
rename to src/internet/model/global-route-manager-impl.cc
diff --git a/src/routing/global-routing/model/global-route-manager-impl.h b/src/internet/model/global-route-manager-impl.h
similarity index 100%
rename from src/routing/global-routing/model/global-route-manager-impl.h
rename to src/internet/model/global-route-manager-impl.h
diff --git a/src/routing/global-routing/model/global-route-manager.cc b/src/internet/model/global-route-manager.cc
similarity index 100%
rename from src/routing/global-routing/model/global-route-manager.cc
rename to src/internet/model/global-route-manager.cc
diff --git a/src/routing/global-routing/model/global-route-manager.h b/src/internet/model/global-route-manager.h
similarity index 100%
rename from src/routing/global-routing/model/global-route-manager.h
rename to src/internet/model/global-route-manager.h
diff --git a/src/routing/global-routing/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc
similarity index 100%
rename from src/routing/global-routing/model/global-router-interface.cc
rename to src/internet/model/global-router-interface.cc
diff --git a/src/routing/global-routing/model/global-router-interface.h b/src/internet/model/global-router-interface.h
similarity index 100%
rename from src/routing/global-routing/model/global-router-interface.h
rename to src/internet/model/global-router-interface.h
diff --git a/src/routing/global-routing/model/global-routing.h b/src/internet/model/global-routing.h
similarity index 100%
rename from src/routing/global-routing/model/global-routing.h
rename to src/internet/model/global-routing.h
diff --git a/src/internet-stack/icmpv4-l4-protocol.cc b/src/internet/model/icmpv4-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/icmpv4-l4-protocol.cc
rename to src/internet/model/icmpv4-l4-protocol.cc
diff --git a/src/internet-stack/icmpv4-l4-protocol.h b/src/internet/model/icmpv4-l4-protocol.h
similarity index 100%
rename from src/internet-stack/icmpv4-l4-protocol.h
rename to src/internet/model/icmpv4-l4-protocol.h
diff --git a/src/internet-stack/icmpv4.cc b/src/internet/model/icmpv4.cc
similarity index 100%
rename from src/internet-stack/icmpv4.cc
rename to src/internet/model/icmpv4.cc
diff --git a/src/internet-stack/icmpv4.h b/src/internet/model/icmpv4.h
similarity index 100%
rename from src/internet-stack/icmpv4.h
rename to src/internet/model/icmpv4.h
diff --git a/src/internet-stack/icmpv6-header.cc b/src/internet/model/icmpv6-header.cc
similarity index 100%
rename from src/internet-stack/icmpv6-header.cc
rename to src/internet/model/icmpv6-header.cc
diff --git a/src/internet-stack/icmpv6-header.h b/src/internet/model/icmpv6-header.h
similarity index 100%
rename from src/internet-stack/icmpv6-header.h
rename to src/internet/model/icmpv6-header.h
diff --git a/src/internet-stack/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/icmpv6-l4-protocol.cc
rename to src/internet/model/icmpv6-l4-protocol.cc
diff --git a/src/internet-stack/icmpv6-l4-protocol.h b/src/internet/model/icmpv6-l4-protocol.h
similarity index 100%
rename from src/internet-stack/icmpv6-l4-protocol.h
rename to src/internet/model/icmpv6-l4-protocol.h
diff --git a/src/internet-stack/ipv4-address-generator.cc b/src/internet/model/ipv4-address-generator.cc
similarity index 100%
rename from src/internet-stack/ipv4-address-generator.cc
rename to src/internet/model/ipv4-address-generator.cc
diff --git a/src/internet-stack/ipv4-address-generator.h b/src/internet/model/ipv4-address-generator.h
similarity index 100%
rename from src/internet-stack/ipv4-address-generator.h
rename to src/internet/model/ipv4-address-generator.h
diff --git a/src/internet-stack/ipv4-end-point-demux.cc b/src/internet/model/ipv4-end-point-demux.cc
similarity index 100%
rename from src/internet-stack/ipv4-end-point-demux.cc
rename to src/internet/model/ipv4-end-point-demux.cc
diff --git a/src/internet-stack/ipv4-end-point-demux.h b/src/internet/model/ipv4-end-point-demux.h
similarity index 100%
rename from src/internet-stack/ipv4-end-point-demux.h
rename to src/internet/model/ipv4-end-point-demux.h
diff --git a/src/internet-stack/ipv4-end-point.cc b/src/internet/model/ipv4-end-point.cc
similarity index 100%
rename from src/internet-stack/ipv4-end-point.cc
rename to src/internet/model/ipv4-end-point.cc
diff --git a/src/internet-stack/ipv4-end-point.h b/src/internet/model/ipv4-end-point.h
similarity index 100%
rename from src/internet-stack/ipv4-end-point.h
rename to src/internet/model/ipv4-end-point.h
diff --git a/src/routing/global-routing/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc
similarity index 100%
rename from src/routing/global-routing/model/ipv4-global-routing.cc
rename to src/internet/model/ipv4-global-routing.cc
diff --git a/src/routing/global-routing/model/ipv4-global-routing.h b/src/internet/model/ipv4-global-routing.h
similarity index 100%
rename from src/routing/global-routing/model/ipv4-global-routing.h
rename to src/internet/model/ipv4-global-routing.h
diff --git a/src/internet-stack/ipv4-header.cc b/src/internet/model/ipv4-header.cc
similarity index 100%
rename from src/internet-stack/ipv4-header.cc
rename to src/internet/model/ipv4-header.cc
diff --git a/src/internet-stack/ipv4-header.h b/src/internet/model/ipv4-header.h
similarity index 100%
rename from src/internet-stack/ipv4-header.h
rename to src/internet/model/ipv4-header.h
diff --git a/src/internet-stack/ipv4-interface-address.cc b/src/internet/model/ipv4-interface-address.cc
similarity index 100%
rename from src/internet-stack/ipv4-interface-address.cc
rename to src/internet/model/ipv4-interface-address.cc
diff --git a/src/internet-stack/ipv4-interface-address.h b/src/internet/model/ipv4-interface-address.h
similarity index 100%
rename from src/internet-stack/ipv4-interface-address.h
rename to src/internet/model/ipv4-interface-address.h
diff --git a/src/internet-stack/ipv4-interface.cc b/src/internet/model/ipv4-interface.cc
similarity index 100%
rename from src/internet-stack/ipv4-interface.cc
rename to src/internet/model/ipv4-interface.cc
diff --git a/src/internet-stack/ipv4-interface.h b/src/internet/model/ipv4-interface.h
similarity index 100%
rename from src/internet-stack/ipv4-interface.h
rename to src/internet/model/ipv4-interface.h
diff --git a/src/internet-stack/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc
similarity index 100%
rename from src/internet-stack/ipv4-l3-protocol.cc
rename to src/internet/model/ipv4-l3-protocol.cc
diff --git a/src/internet-stack/ipv4-l3-protocol.h b/src/internet/model/ipv4-l3-protocol.h
similarity index 100%
rename from src/internet-stack/ipv4-l3-protocol.h
rename to src/internet/model/ipv4-l3-protocol.h
diff --git a/src/internet-stack/ipv4-l4-protocol.cc b/src/internet/model/ipv4-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/ipv4-l4-protocol.cc
rename to src/internet/model/ipv4-l4-protocol.cc
diff --git a/src/internet-stack/ipv4-l4-protocol.h b/src/internet/model/ipv4-l4-protocol.h
similarity index 100%
rename from src/internet-stack/ipv4-l4-protocol.h
rename to src/internet/model/ipv4-l4-protocol.h
diff --git a/src/routing/list-routing/model/ipv4-list-routing.cc b/src/internet/model/ipv4-list-routing.cc
similarity index 100%
rename from src/routing/list-routing/model/ipv4-list-routing.cc
rename to src/internet/model/ipv4-list-routing.cc
diff --git a/src/routing/list-routing/model/ipv4-list-routing.h b/src/internet/model/ipv4-list-routing.h
similarity index 100%
rename from src/routing/list-routing/model/ipv4-list-routing.h
rename to src/internet/model/ipv4-list-routing.h
diff --git a/src/internet-stack/ipv4-packet-info-tag.cc b/src/internet/model/ipv4-packet-info-tag.cc
similarity index 100%
rename from src/internet-stack/ipv4-packet-info-tag.cc
rename to src/internet/model/ipv4-packet-info-tag.cc
diff --git a/src/internet-stack/ipv4-packet-info-tag.h b/src/internet/model/ipv4-packet-info-tag.h
similarity index 100%
rename from src/internet-stack/ipv4-packet-info-tag.h
rename to src/internet/model/ipv4-packet-info-tag.h
diff --git a/src/internet-stack/ipv4-raw-socket-factory-impl.cc b/src/internet/model/ipv4-raw-socket-factory-impl.cc
similarity index 100%
rename from src/internet-stack/ipv4-raw-socket-factory-impl.cc
rename to src/internet/model/ipv4-raw-socket-factory-impl.cc
diff --git a/src/internet-stack/ipv4-raw-socket-factory-impl.h b/src/internet/model/ipv4-raw-socket-factory-impl.h
similarity index 100%
rename from src/internet-stack/ipv4-raw-socket-factory-impl.h
rename to src/internet/model/ipv4-raw-socket-factory-impl.h
diff --git a/src/internet-stack/ipv4-raw-socket-factory.cc b/src/internet/model/ipv4-raw-socket-factory.cc
similarity index 100%
rename from src/internet-stack/ipv4-raw-socket-factory.cc
rename to src/internet/model/ipv4-raw-socket-factory.cc
diff --git a/src/internet-stack/ipv4-raw-socket-factory.h b/src/internet/model/ipv4-raw-socket-factory.h
similarity index 100%
rename from src/internet-stack/ipv4-raw-socket-factory.h
rename to src/internet/model/ipv4-raw-socket-factory.h
diff --git a/src/internet-stack/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc
similarity index 100%
rename from src/internet-stack/ipv4-raw-socket-impl.cc
rename to src/internet/model/ipv4-raw-socket-impl.cc
diff --git a/src/internet-stack/ipv4-raw-socket-impl.h b/src/internet/model/ipv4-raw-socket-impl.h
similarity index 100%
rename from src/internet-stack/ipv4-raw-socket-impl.h
rename to src/internet/model/ipv4-raw-socket-impl.h
diff --git a/src/internet-stack/ipv4-route.cc b/src/internet/model/ipv4-route.cc
similarity index 100%
rename from src/internet-stack/ipv4-route.cc
rename to src/internet/model/ipv4-route.cc
diff --git a/src/internet-stack/ipv4-route.h b/src/internet/model/ipv4-route.h
similarity index 100%
rename from src/internet-stack/ipv4-route.h
rename to src/internet/model/ipv4-route.h
diff --git a/src/internet-stack/ipv4-routing-protocol.cc b/src/internet/model/ipv4-routing-protocol.cc
similarity index 100%
rename from src/internet-stack/ipv4-routing-protocol.cc
rename to src/internet/model/ipv4-routing-protocol.cc
diff --git a/src/internet-stack/ipv4-routing-protocol.h b/src/internet/model/ipv4-routing-protocol.h
similarity index 100%
rename from src/internet-stack/ipv4-routing-protocol.h
rename to src/internet/model/ipv4-routing-protocol.h
diff --git a/src/routing/static-routing/model/ipv4-routing-table-entry.cc b/src/internet/model/ipv4-routing-table-entry.cc
similarity index 100%
rename from src/routing/static-routing/model/ipv4-routing-table-entry.cc
rename to src/internet/model/ipv4-routing-table-entry.cc
diff --git a/src/routing/static-routing/model/ipv4-routing-table-entry.h b/src/internet/model/ipv4-routing-table-entry.h
similarity index 100%
rename from src/routing/static-routing/model/ipv4-routing-table-entry.h
rename to src/internet/model/ipv4-routing-table-entry.h
diff --git a/src/routing/static-routing/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc
similarity index 100%
rename from src/routing/static-routing/model/ipv4-static-routing.cc
rename to src/internet/model/ipv4-static-routing.cc
diff --git a/src/routing/static-routing/model/ipv4-static-routing.h b/src/internet/model/ipv4-static-routing.h
similarity index 100%
rename from src/routing/static-routing/model/ipv4-static-routing.h
rename to src/internet/model/ipv4-static-routing.h
diff --git a/src/internet-stack/ipv4.cc b/src/internet/model/ipv4.cc
similarity index 100%
rename from src/internet-stack/ipv4.cc
rename to src/internet/model/ipv4.cc
diff --git a/src/internet-stack/ipv4.h b/src/internet/model/ipv4.h
similarity index 100%
rename from src/internet-stack/ipv4.h
rename to src/internet/model/ipv4.h
diff --git a/src/internet-stack/ipv6-autoconfigured-prefix.cc b/src/internet/model/ipv6-autoconfigured-prefix.cc
similarity index 100%
rename from src/internet-stack/ipv6-autoconfigured-prefix.cc
rename to src/internet/model/ipv6-autoconfigured-prefix.cc
diff --git a/src/internet-stack/ipv6-autoconfigured-prefix.h b/src/internet/model/ipv6-autoconfigured-prefix.h
similarity index 100%
rename from src/internet-stack/ipv6-autoconfigured-prefix.h
rename to src/internet/model/ipv6-autoconfigured-prefix.h
diff --git a/src/internet-stack/ipv6-end-point-demux.cc b/src/internet/model/ipv6-end-point-demux.cc
similarity index 100%
rename from src/internet-stack/ipv6-end-point-demux.cc
rename to src/internet/model/ipv6-end-point-demux.cc
diff --git a/src/internet-stack/ipv6-end-point-demux.h b/src/internet/model/ipv6-end-point-demux.h
similarity index 100%
rename from src/internet-stack/ipv6-end-point-demux.h
rename to src/internet/model/ipv6-end-point-demux.h
diff --git a/src/internet-stack/ipv6-end-point.cc b/src/internet/model/ipv6-end-point.cc
similarity index 100%
rename from src/internet-stack/ipv6-end-point.cc
rename to src/internet/model/ipv6-end-point.cc
diff --git a/src/internet-stack/ipv6-end-point.h b/src/internet/model/ipv6-end-point.h
similarity index 100%
rename from src/internet-stack/ipv6-end-point.h
rename to src/internet/model/ipv6-end-point.h
diff --git a/src/internet-stack/ipv6-extension-demux.cc b/src/internet/model/ipv6-extension-demux.cc
similarity index 100%
rename from src/internet-stack/ipv6-extension-demux.cc
rename to src/internet/model/ipv6-extension-demux.cc
diff --git a/src/internet-stack/ipv6-extension-demux.h b/src/internet/model/ipv6-extension-demux.h
similarity index 100%
rename from src/internet-stack/ipv6-extension-demux.h
rename to src/internet/model/ipv6-extension-demux.h
diff --git a/src/internet-stack/ipv6-extension-header.cc b/src/internet/model/ipv6-extension-header.cc
similarity index 100%
rename from src/internet-stack/ipv6-extension-header.cc
rename to src/internet/model/ipv6-extension-header.cc
diff --git a/src/internet-stack/ipv6-extension-header.h b/src/internet/model/ipv6-extension-header.h
similarity index 100%
rename from src/internet-stack/ipv6-extension-header.h
rename to src/internet/model/ipv6-extension-header.h
diff --git a/src/internet-stack/ipv6-extension.cc b/src/internet/model/ipv6-extension.cc
similarity index 100%
rename from src/internet-stack/ipv6-extension.cc
rename to src/internet/model/ipv6-extension.cc
diff --git a/src/internet-stack/ipv6-extension.h b/src/internet/model/ipv6-extension.h
similarity index 100%
rename from src/internet-stack/ipv6-extension.h
rename to src/internet/model/ipv6-extension.h
diff --git a/src/internet-stack/ipv6-header.cc b/src/internet/model/ipv6-header.cc
similarity index 100%
rename from src/internet-stack/ipv6-header.cc
rename to src/internet/model/ipv6-header.cc
diff --git a/src/internet-stack/ipv6-header.h b/src/internet/model/ipv6-header.h
similarity index 100%
rename from src/internet-stack/ipv6-header.h
rename to src/internet/model/ipv6-header.h
diff --git a/src/internet-stack/ipv6-interface-address.cc b/src/internet/model/ipv6-interface-address.cc
similarity index 100%
rename from src/internet-stack/ipv6-interface-address.cc
rename to src/internet/model/ipv6-interface-address.cc
diff --git a/src/internet-stack/ipv6-interface-address.h b/src/internet/model/ipv6-interface-address.h
similarity index 100%
rename from src/internet-stack/ipv6-interface-address.h
rename to src/internet/model/ipv6-interface-address.h
diff --git a/src/internet-stack/ipv6-interface.cc b/src/internet/model/ipv6-interface.cc
similarity index 100%
rename from src/internet-stack/ipv6-interface.cc
rename to src/internet/model/ipv6-interface.cc
diff --git a/src/internet-stack/ipv6-interface.h b/src/internet/model/ipv6-interface.h
similarity index 100%
rename from src/internet-stack/ipv6-interface.h
rename to src/internet/model/ipv6-interface.h
diff --git a/src/internet-stack/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc
similarity index 100%
rename from src/internet-stack/ipv6-l3-protocol.cc
rename to src/internet/model/ipv6-l3-protocol.cc
diff --git a/src/internet-stack/ipv6-l3-protocol.h b/src/internet/model/ipv6-l3-protocol.h
similarity index 100%
rename from src/internet-stack/ipv6-l3-protocol.h
rename to src/internet/model/ipv6-l3-protocol.h
diff --git a/src/internet-stack/ipv6-l4-protocol.cc b/src/internet/model/ipv6-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/ipv6-l4-protocol.cc
rename to src/internet/model/ipv6-l4-protocol.cc
diff --git a/src/internet-stack/ipv6-l4-protocol.h b/src/internet/model/ipv6-l4-protocol.h
similarity index 100%
rename from src/internet-stack/ipv6-l4-protocol.h
rename to src/internet/model/ipv6-l4-protocol.h
diff --git a/src/routing/list-routing/model/ipv6-list-routing.cc b/src/internet/model/ipv6-list-routing.cc
similarity index 100%
rename from src/routing/list-routing/model/ipv6-list-routing.cc
rename to src/internet/model/ipv6-list-routing.cc
diff --git a/src/routing/list-routing/model/ipv6-list-routing.h b/src/internet/model/ipv6-list-routing.h
similarity index 100%
rename from src/routing/list-routing/model/ipv6-list-routing.h
rename to src/internet/model/ipv6-list-routing.h
diff --git a/src/internet-stack/ipv6-option-demux.cc b/src/internet/model/ipv6-option-demux.cc
similarity index 100%
rename from src/internet-stack/ipv6-option-demux.cc
rename to src/internet/model/ipv6-option-demux.cc
diff --git a/src/internet-stack/ipv6-option-demux.h b/src/internet/model/ipv6-option-demux.h
similarity index 100%
rename from src/internet-stack/ipv6-option-demux.h
rename to src/internet/model/ipv6-option-demux.h
diff --git a/src/internet-stack/ipv6-option-header.cc b/src/internet/model/ipv6-option-header.cc
similarity index 100%
rename from src/internet-stack/ipv6-option-header.cc
rename to src/internet/model/ipv6-option-header.cc
diff --git a/src/internet-stack/ipv6-option-header.h b/src/internet/model/ipv6-option-header.h
similarity index 100%
rename from src/internet-stack/ipv6-option-header.h
rename to src/internet/model/ipv6-option-header.h
diff --git a/src/internet-stack/ipv6-option.cc b/src/internet/model/ipv6-option.cc
similarity index 100%
rename from src/internet-stack/ipv6-option.cc
rename to src/internet/model/ipv6-option.cc
diff --git a/src/internet-stack/ipv6-option.h b/src/internet/model/ipv6-option.h
similarity index 100%
rename from src/internet-stack/ipv6-option.h
rename to src/internet/model/ipv6-option.h
diff --git a/src/internet-stack/ipv6-packet-info-tag.cc b/src/internet/model/ipv6-packet-info-tag.cc
similarity index 100%
rename from src/internet-stack/ipv6-packet-info-tag.cc
rename to src/internet/model/ipv6-packet-info-tag.cc
diff --git a/src/internet-stack/ipv6-packet-info-tag.h b/src/internet/model/ipv6-packet-info-tag.h
similarity index 100%
rename from src/internet-stack/ipv6-packet-info-tag.h
rename to src/internet/model/ipv6-packet-info-tag.h
diff --git a/src/internet-stack/ipv6-raw-socket-factory-impl.cc b/src/internet/model/ipv6-raw-socket-factory-impl.cc
similarity index 100%
rename from src/internet-stack/ipv6-raw-socket-factory-impl.cc
rename to src/internet/model/ipv6-raw-socket-factory-impl.cc
diff --git a/src/internet-stack/ipv6-raw-socket-factory-impl.h b/src/internet/model/ipv6-raw-socket-factory-impl.h
similarity index 100%
rename from src/internet-stack/ipv6-raw-socket-factory-impl.h
rename to src/internet/model/ipv6-raw-socket-factory-impl.h
diff --git a/src/internet-stack/ipv6-raw-socket-factory.cc b/src/internet/model/ipv6-raw-socket-factory.cc
similarity index 100%
rename from src/internet-stack/ipv6-raw-socket-factory.cc
rename to src/internet/model/ipv6-raw-socket-factory.cc
diff --git a/src/internet-stack/ipv6-raw-socket-factory.h b/src/internet/model/ipv6-raw-socket-factory.h
similarity index 100%
rename from src/internet-stack/ipv6-raw-socket-factory.h
rename to src/internet/model/ipv6-raw-socket-factory.h
diff --git a/src/internet-stack/ipv6-raw-socket-impl.cc b/src/internet/model/ipv6-raw-socket-impl.cc
similarity index 100%
rename from src/internet-stack/ipv6-raw-socket-impl.cc
rename to src/internet/model/ipv6-raw-socket-impl.cc
diff --git a/src/internet-stack/ipv6-raw-socket-impl.h b/src/internet/model/ipv6-raw-socket-impl.h
similarity index 100%
rename from src/internet-stack/ipv6-raw-socket-impl.h
rename to src/internet/model/ipv6-raw-socket-impl.h
diff --git a/src/internet-stack/ipv6-route.cc b/src/internet/model/ipv6-route.cc
similarity index 100%
rename from src/internet-stack/ipv6-route.cc
rename to src/internet/model/ipv6-route.cc
diff --git a/src/internet-stack/ipv6-route.h b/src/internet/model/ipv6-route.h
similarity index 100%
rename from src/internet-stack/ipv6-route.h
rename to src/internet/model/ipv6-route.h
diff --git a/src/internet-stack/ipv6-routing-protocol.cc b/src/internet/model/ipv6-routing-protocol.cc
similarity index 100%
rename from src/internet-stack/ipv6-routing-protocol.cc
rename to src/internet/model/ipv6-routing-protocol.cc
diff --git a/src/internet-stack/ipv6-routing-protocol.h b/src/internet/model/ipv6-routing-protocol.h
similarity index 100%
rename from src/internet-stack/ipv6-routing-protocol.h
rename to src/internet/model/ipv6-routing-protocol.h
diff --git a/src/routing/static-routing/model/ipv6-routing-table-entry.cc b/src/internet/model/ipv6-routing-table-entry.cc
similarity index 100%
rename from src/routing/static-routing/model/ipv6-routing-table-entry.cc
rename to src/internet/model/ipv6-routing-table-entry.cc
diff --git a/src/routing/static-routing/model/ipv6-routing-table-entry.h b/src/internet/model/ipv6-routing-table-entry.h
similarity index 100%
rename from src/routing/static-routing/model/ipv6-routing-table-entry.h
rename to src/internet/model/ipv6-routing-table-entry.h
diff --git a/src/routing/static-routing/model/ipv6-static-routing.cc b/src/internet/model/ipv6-static-routing.cc
similarity index 100%
rename from src/routing/static-routing/model/ipv6-static-routing.cc
rename to src/internet/model/ipv6-static-routing.cc
diff --git a/src/routing/static-routing/model/ipv6-static-routing.h b/src/internet/model/ipv6-static-routing.h
similarity index 100%
rename from src/routing/static-routing/model/ipv6-static-routing.h
rename to src/internet/model/ipv6-static-routing.h
diff --git a/src/internet-stack/ipv6.cc b/src/internet/model/ipv6.cc
similarity index 100%
rename from src/internet-stack/ipv6.cc
rename to src/internet/model/ipv6.cc
diff --git a/src/internet-stack/ipv6.h b/src/internet/model/ipv6.h
similarity index 100%
rename from src/internet-stack/ipv6.h
rename to src/internet/model/ipv6.h
diff --git a/src/internet-stack/loopback-net-device.cc b/src/internet/model/loopback-net-device.cc
similarity index 100%
rename from src/internet-stack/loopback-net-device.cc
rename to src/internet/model/loopback-net-device.cc
diff --git a/src/internet-stack/loopback-net-device.h b/src/internet/model/loopback-net-device.h
similarity index 100%
rename from src/internet-stack/loopback-net-device.h
rename to src/internet/model/loopback-net-device.h
diff --git a/src/internet-stack/ndisc-cache.cc b/src/internet/model/ndisc-cache.cc
similarity index 100%
rename from src/internet-stack/ndisc-cache.cc
rename to src/internet/model/ndisc-cache.cc
diff --git a/src/internet-stack/ndisc-cache.h b/src/internet/model/ndisc-cache.h
similarity index 100%
rename from src/internet-stack/ndisc-cache.h
rename to src/internet/model/ndisc-cache.h
diff --git a/src/internet-stack/nsc-sysctl.cc b/src/internet/model/nsc-sysctl.cc
similarity index 100%
rename from src/internet-stack/nsc-sysctl.cc
rename to src/internet/model/nsc-sysctl.cc
diff --git a/src/internet-stack/nsc-sysctl.h b/src/internet/model/nsc-sysctl.h
similarity index 100%
rename from src/internet-stack/nsc-sysctl.h
rename to src/internet/model/nsc-sysctl.h
diff --git a/src/internet-stack/nsc-tcp-l4-protocol.cc b/src/internet/model/nsc-tcp-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/nsc-tcp-l4-protocol.cc
rename to src/internet/model/nsc-tcp-l4-protocol.cc
diff --git a/src/internet-stack/nsc-tcp-l4-protocol.h b/src/internet/model/nsc-tcp-l4-protocol.h
similarity index 100%
rename from src/internet-stack/nsc-tcp-l4-protocol.h
rename to src/internet/model/nsc-tcp-l4-protocol.h
diff --git a/src/internet-stack/nsc-tcp-socket-factory-impl.cc b/src/internet/model/nsc-tcp-socket-factory-impl.cc
similarity index 100%
rename from src/internet-stack/nsc-tcp-socket-factory-impl.cc
rename to src/internet/model/nsc-tcp-socket-factory-impl.cc
diff --git a/src/internet-stack/nsc-tcp-socket-factory-impl.h b/src/internet/model/nsc-tcp-socket-factory-impl.h
similarity index 100%
rename from src/internet-stack/nsc-tcp-socket-factory-impl.h
rename to src/internet/model/nsc-tcp-socket-factory-impl.h
diff --git a/src/internet-stack/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc
similarity index 100%
rename from src/internet-stack/nsc-tcp-socket-impl.cc
rename to src/internet/model/nsc-tcp-socket-impl.cc
diff --git a/src/internet-stack/nsc-tcp-socket-impl.h b/src/internet/model/nsc-tcp-socket-impl.h
similarity index 100%
rename from src/internet-stack/nsc-tcp-socket-impl.h
rename to src/internet/model/nsc-tcp-socket-impl.h
diff --git a/src/internet-stack/pending-data.cc b/src/internet/model/pending-data.cc
similarity index 100%
rename from src/internet-stack/pending-data.cc
rename to src/internet/model/pending-data.cc
diff --git a/src/internet-stack/pending-data.h b/src/internet/model/pending-data.h
similarity index 100%
rename from src/internet-stack/pending-data.h
rename to src/internet/model/pending-data.h
diff --git a/src/internet-stack/rtt-estimator.cc b/src/internet/model/rtt-estimator.cc
similarity index 100%
rename from src/internet-stack/rtt-estimator.cc
rename to src/internet/model/rtt-estimator.cc
diff --git a/src/internet-stack/rtt-estimator.h b/src/internet/model/rtt-estimator.h
similarity index 100%
rename from src/internet-stack/rtt-estimator.h
rename to src/internet/model/rtt-estimator.h
diff --git a/src/internet-stack/sim_errno.h b/src/internet/model/sim_errno.h
similarity index 100%
rename from src/internet-stack/sim_errno.h
rename to src/internet/model/sim_errno.h
diff --git a/src/internet-stack/sim_interface.h b/src/internet/model/sim_interface.h
similarity index 100%
rename from src/internet-stack/sim_interface.h
rename to src/internet/model/sim_interface.h
diff --git a/src/internet-stack/tcp-header.cc b/src/internet/model/tcp-header.cc
similarity index 100%
rename from src/internet-stack/tcp-header.cc
rename to src/internet/model/tcp-header.cc
diff --git a/src/internet-stack/tcp-header.h b/src/internet/model/tcp-header.h
similarity index 100%
rename from src/internet-stack/tcp-header.h
rename to src/internet/model/tcp-header.h
diff --git a/src/internet-stack/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/tcp-l4-protocol.cc
rename to src/internet/model/tcp-l4-protocol.cc
diff --git a/src/internet-stack/tcp-l4-protocol.h b/src/internet/model/tcp-l4-protocol.h
similarity index 100%
rename from src/internet-stack/tcp-l4-protocol.h
rename to src/internet/model/tcp-l4-protocol.h
diff --git a/src/internet-stack/tcp-newreno.cc b/src/internet/model/tcp-newreno.cc
similarity index 100%
rename from src/internet-stack/tcp-newreno.cc
rename to src/internet/model/tcp-newreno.cc
diff --git a/src/internet-stack/tcp-newreno.h b/src/internet/model/tcp-newreno.h
similarity index 100%
rename from src/internet-stack/tcp-newreno.h
rename to src/internet/model/tcp-newreno.h
diff --git a/src/internet-stack/tcp-reno.cc b/src/internet/model/tcp-reno.cc
similarity index 100%
rename from src/internet-stack/tcp-reno.cc
rename to src/internet/model/tcp-reno.cc
diff --git a/src/internet-stack/tcp-reno.h b/src/internet/model/tcp-reno.h
similarity index 100%
rename from src/internet-stack/tcp-reno.h
rename to src/internet/model/tcp-reno.h
diff --git a/src/internet-stack/tcp-rfc793.cc b/src/internet/model/tcp-rfc793.cc
similarity index 100%
rename from src/internet-stack/tcp-rfc793.cc
rename to src/internet/model/tcp-rfc793.cc
diff --git a/src/internet-stack/tcp-rfc793.h b/src/internet/model/tcp-rfc793.h
similarity index 100%
rename from src/internet-stack/tcp-rfc793.h
rename to src/internet/model/tcp-rfc793.h
diff --git a/src/internet-stack/tcp-rx-buffer.cc b/src/internet/model/tcp-rx-buffer.cc
similarity index 100%
rename from src/internet-stack/tcp-rx-buffer.cc
rename to src/internet/model/tcp-rx-buffer.cc
diff --git a/src/internet-stack/tcp-rx-buffer.h b/src/internet/model/tcp-rx-buffer.h
similarity index 100%
rename from src/internet-stack/tcp-rx-buffer.h
rename to src/internet/model/tcp-rx-buffer.h
diff --git a/src/internet-stack/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
similarity index 100%
rename from src/internet-stack/tcp-socket-base.cc
rename to src/internet/model/tcp-socket-base.cc
diff --git a/src/internet-stack/tcp-socket-base.h b/src/internet/model/tcp-socket-base.h
similarity index 100%
rename from src/internet-stack/tcp-socket-base.h
rename to src/internet/model/tcp-socket-base.h
diff --git a/src/internet-stack/tcp-socket-factory-impl.cc b/src/internet/model/tcp-socket-factory-impl.cc
similarity index 100%
rename from src/internet-stack/tcp-socket-factory-impl.cc
rename to src/internet/model/tcp-socket-factory-impl.cc
diff --git a/src/internet-stack/tcp-socket-factory-impl.h b/src/internet/model/tcp-socket-factory-impl.h
similarity index 100%
rename from src/internet-stack/tcp-socket-factory-impl.h
rename to src/internet/model/tcp-socket-factory-impl.h
diff --git a/src/internet-stack/tcp-socket-factory.cc b/src/internet/model/tcp-socket-factory.cc
similarity index 100%
rename from src/internet-stack/tcp-socket-factory.cc
rename to src/internet/model/tcp-socket-factory.cc
diff --git a/src/internet-stack/tcp-socket-factory.h b/src/internet/model/tcp-socket-factory.h
similarity index 100%
rename from src/internet-stack/tcp-socket-factory.h
rename to src/internet/model/tcp-socket-factory.h
diff --git a/src/internet-stack/tcp-socket.cc b/src/internet/model/tcp-socket.cc
similarity index 100%
rename from src/internet-stack/tcp-socket.cc
rename to src/internet/model/tcp-socket.cc
diff --git a/src/internet-stack/tcp-socket.h b/src/internet/model/tcp-socket.h
similarity index 100%
rename from src/internet-stack/tcp-socket.h
rename to src/internet/model/tcp-socket.h
diff --git a/src/internet-stack/tcp-tahoe.cc b/src/internet/model/tcp-tahoe.cc
similarity index 100%
rename from src/internet-stack/tcp-tahoe.cc
rename to src/internet/model/tcp-tahoe.cc
diff --git a/src/internet-stack/tcp-tahoe.h b/src/internet/model/tcp-tahoe.h
similarity index 100%
rename from src/internet-stack/tcp-tahoe.h
rename to src/internet/model/tcp-tahoe.h
diff --git a/src/internet-stack/tcp-tx-buffer.cc b/src/internet/model/tcp-tx-buffer.cc
similarity index 100%
rename from src/internet-stack/tcp-tx-buffer.cc
rename to src/internet/model/tcp-tx-buffer.cc
diff --git a/src/internet-stack/tcp-tx-buffer.h b/src/internet/model/tcp-tx-buffer.h
similarity index 100%
rename from src/internet-stack/tcp-tx-buffer.h
rename to src/internet/model/tcp-tx-buffer.h
diff --git a/src/internet-stack/udp-header.cc b/src/internet/model/udp-header.cc
similarity index 100%
rename from src/internet-stack/udp-header.cc
rename to src/internet/model/udp-header.cc
diff --git a/src/internet-stack/udp-header.h b/src/internet/model/udp-header.h
similarity index 100%
rename from src/internet-stack/udp-header.h
rename to src/internet/model/udp-header.h
diff --git a/src/internet-stack/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc
similarity index 100%
rename from src/internet-stack/udp-l4-protocol.cc
rename to src/internet/model/udp-l4-protocol.cc
diff --git a/src/internet-stack/udp-l4-protocol.h b/src/internet/model/udp-l4-protocol.h
similarity index 100%
rename from src/internet-stack/udp-l4-protocol.h
rename to src/internet/model/udp-l4-protocol.h
diff --git a/src/internet-stack/udp-socket-factory-impl.cc b/src/internet/model/udp-socket-factory-impl.cc
similarity index 100%
rename from src/internet-stack/udp-socket-factory-impl.cc
rename to src/internet/model/udp-socket-factory-impl.cc
diff --git a/src/internet-stack/udp-socket-factory-impl.h b/src/internet/model/udp-socket-factory-impl.h
similarity index 100%
rename from src/internet-stack/udp-socket-factory-impl.h
rename to src/internet/model/udp-socket-factory-impl.h
diff --git a/src/internet-stack/udp-socket-factory.cc b/src/internet/model/udp-socket-factory.cc
similarity index 100%
rename from src/internet-stack/udp-socket-factory.cc
rename to src/internet/model/udp-socket-factory.cc
diff --git a/src/internet-stack/udp-socket-factory.h b/src/internet/model/udp-socket-factory.h
similarity index 100%
rename from src/internet-stack/udp-socket-factory.h
rename to src/internet/model/udp-socket-factory.h
diff --git a/src/internet-stack/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc
similarity index 100%
rename from src/internet-stack/udp-socket-impl.cc
rename to src/internet/model/udp-socket-impl.cc
diff --git a/src/internet-stack/udp-socket-impl.h b/src/internet/model/udp-socket-impl.h
similarity index 100%
rename from src/internet-stack/udp-socket-impl.h
rename to src/internet/model/udp-socket-impl.h
diff --git a/src/internet-stack/udp-socket.cc b/src/internet/model/udp-socket.cc
similarity index 100%
rename from src/internet-stack/udp-socket.cc
rename to src/internet/model/udp-socket.cc
diff --git a/src/internet-stack/udp-socket.h b/src/internet/model/udp-socket.h
similarity index 100%
rename from src/internet-stack/udp-socket.h
rename to src/internet/model/udp-socket.h
diff --git a/src/internet-stack/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc
similarity index 99%
rename from src/internet-stack/ipv4-raw-test.cc
rename to src/internet/test/ipv4-raw-test.cc
index 82017d1fb..39fd2bb3f 100644
--- a/src/internet-stack/ipv4-raw-test.cc
+++ b/src/internet/test/ipv4-raw-test.cc
@@ -35,9 +35,9 @@
 #include "ns3/inet-socket-address.h"
 #include "ns3/boolean.h"
 
-#include "arp-l3-protocol.h"
-#include "ipv4-l3-protocol.h"
-#include "icmpv4-l4-protocol.h"
+#include "ns3/arp-l3-protocol.h"
+#include "ns3/ipv4-l3-protocol.h"
+#include "ns3/icmpv4-l4-protocol.h"
 #include "ns3/ipv4-list-routing.h"
 #include "ns3/ipv4-static-routing.h"
 
diff --git a/src/internet-stack/ipv4-test.cc b/src/internet/test/ipv4-test.cc
similarity index 95%
rename from src/internet-stack/ipv4-test.cc
rename to src/internet/test/ipv4-test.cc
index 0b6a18994..ef25433c3 100644
--- a/src/internet-stack/ipv4-test.cc
+++ b/src/internet/test/ipv4-test.cc
@@ -25,10 +25,10 @@
 #include "ns3/inet-socket-address.h"
 #include "ns3/node.h"
 
-#include "ipv4-l3-protocol.h"
-#include "arp-l3-protocol.h"
-#include "ipv4-interface.h"
-#include "loopback-net-device.h"
+#include "ns3/ipv4-l3-protocol.h"
+#include "ns3/arp-l3-protocol.h"
+#include "ns3/ipv4-interface.h"
+#include "ns3/loopback-net-device.h"
 
 namespace ns3 {
 
diff --git a/src/internet-stack/ipv6-extension-header-test-suite.cc b/src/internet/test/ipv6-extension-header-test-suite.cc
similarity index 99%
rename from src/internet-stack/ipv6-extension-header-test-suite.cc
rename to src/internet/test/ipv6-extension-header-test-suite.cc
index eb9d5ee33..5236a5caa 100644
--- a/src/internet-stack/ipv6-extension-header-test-suite.cc
+++ b/src/internet/test/ipv6-extension-header-test-suite.cc
@@ -17,8 +17,8 @@
  */
 
 #include "ns3/test.h"
-#include "ipv6-extension-header.h"
-#include "ipv6-option-header.h"
+#include "ns3/ipv6-extension-header.h"
+#include "ns3/ipv6-option-header.h"
 
 using namespace ns3;
 
diff --git a/src/internet-stack/ipv6-test.cc b/src/internet/test/ipv6-test.cc
similarity index 94%
rename from src/internet-stack/ipv6-test.cc
rename to src/internet/test/ipv6-test.cc
index 1bcc55084..9b9073699 100644
--- a/src/internet-stack/ipv6-test.cc
+++ b/src/internet/test/ipv6-test.cc
@@ -24,11 +24,11 @@
 #include "ns3/boolean.h"
 #include "ns3/inet6-socket-address.h"
 #include "ns3/node.h"
-#include "ns3/csma-net-device.h"
+#include "ns3/simple-net-device.h"
 
-#include "ipv6-interface.h"
-#include "ipv6-l3-protocol.h"
-#include "icmpv6-l4-protocol.h"
+#include "ns3/ipv6-interface.h"
+#include "ns3/ipv6-l3-protocol.h"
+#include "ns3/icmpv6-l4-protocol.h"
 
 namespace ns3 {
 class Ipv6L3ProtocolTestCase : public TestCase
@@ -67,8 +67,8 @@ Ipv6L3ProtocolTestCase::DoRun ()
   Ptr<Icmpv6L4Protocol> icmpv6 = CreateObject<Icmpv6L4Protocol> ();
   Ptr<Ipv6Interface> interface = CreateObject<Ipv6Interface> ();
   Ptr<Ipv6Interface> interface2 = CreateObject<Ipv6Interface> ();
-  Ptr<CsmaNetDevice> device = CreateObject<CsmaNetDevice> ();
-  Ptr<CsmaNetDevice> device2 = CreateObject<CsmaNetDevice> ();
+  Ptr<SimpleNetDevice> device = CreateObject<SimpleNetDevice> ();
+  Ptr<SimpleNetDevice> device2 = CreateObject<SimpleNetDevice> ();
   uint32_t index = 0;
 
   /* init */
diff --git a/src/internet-stack/tcp-test.cc b/src/internet/test/tcp-test.cc
similarity index 98%
rename from src/internet-stack/tcp-test.cc
rename to src/internet/test/tcp-test.cc
index e84275e43..52aee17af 100644
--- a/src/internet-stack/tcp-test.cc
+++ b/src/internet/test/tcp-test.cc
@@ -35,12 +35,12 @@
 #include "ns3/uinteger.h"
 #include "ns3/log.h"
 
-#include "ipv4-end-point.h"
-#include "arp-l3-protocol.h"
-#include "ipv4-l3-protocol.h"
-#include "icmpv4-l4-protocol.h"
-#include "udp-l4-protocol.h"
-#include "tcp-l4-protocol.h"
+#include "ns3/ipv4-end-point.h"
+#include "ns3/arp-l3-protocol.h"
+#include "ns3/ipv4-l3-protocol.h"
+#include "ns3/icmpv4-l4-protocol.h"
+#include "ns3/udp-l4-protocol.h"
+#include "ns3/tcp-l4-protocol.h"
 
 #include <string>
 
diff --git a/src/internet-stack/udp-test.cc b/src/internet/test/udp-test.cc
similarity index 98%
rename from src/internet-stack/udp-test.cc
rename to src/internet/test/udp-test.cc
index 271d61fd5..f1b8d9c3d 100644
--- a/src/internet-stack/udp-test.cc
+++ b/src/internet/test/udp-test.cc
@@ -35,11 +35,11 @@
 #include "ns3/node.h"
 #include "ns3/inet-socket-address.h"
 
-#include "arp-l3-protocol.h"
-#include "ipv4-l3-protocol.h"
-#include "icmpv4-l4-protocol.h"
-#include "udp-l4-protocol.h"
-#include "tcp-l4-protocol.h"
+#include "ns3/arp-l3-protocol.h"
+#include "ns3/ipv4-l3-protocol.h"
+#include "ns3/icmpv4-l4-protocol.h"
+#include "ns3/udp-l4-protocol.h"
+#include "ns3/tcp-l4-protocol.h"
 #include "ns3/ipv4-list-routing.h"
 #include "ns3/ipv4-static-routing.h"
 
diff --git a/src/internet-stack/waf b/src/internet/waf
similarity index 100%
rename from src/internet-stack/waf
rename to src/internet/waf
diff --git a/src/internet/wscript b/src/internet/wscript
new file mode 100644
index 000000000..7fa1138ce
--- /dev/null
+++ b/src/internet/wscript
@@ -0,0 +1,269 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+import os
+import sys
+
+import Options
+import Logs
+import Utils
+import Task
+
+# Required NSC version
+NSC_RELEASE_NAME = "nsc-0.5.2"
+
+
+def set_options(opt):
+    opt.add_option('--with-nsc',
+                   help=('Use Network Simulation Cradle, given by the indicated path,'
+                         ' to allow the use of real-world network stacks'),
+                   default='', dest='with_nsc')
+
+
+def configure(conf):
+    conf.env['ENABLE_NSC'] = False
+
+    # checks for flex and bison, which is needed to build NSCs globaliser
+    # TODO: how to move these checks into the allinone scripts?
+    #def check_nsc_buildutils():
+    #    import flex
+    #    import bison
+    #    conf.check_tool('flex bison')
+    #    conf.check(lib='fl', mandatory=True)
+
+    # Check for the location of NSC
+    if Options.options.with_nsc:
+        if os.path.isdir(Options.options.with_nsc):
+            conf.check_message("NSC location", '', True, ("%s (given)" % Options.options.with_nsc))
+            conf.env['WITH_NSC'] = os.path.abspath(Options.options.with_nsc)
+    else:
+        # ns-3-dev uses ../nsc, while ns-3 releases use ../NSC_RELEASE_NAME
+        nsc_dir = os.path.join('..', "nsc")
+        nsc_release_dir = os.path.join('..', NSC_RELEASE_NAME)
+        if os.path.isdir(nsc_dir):
+            conf.check_message("NSC location", '', True, ("%s (guessed)" % nsc_dir))
+            conf.env['WITH_NSC'] = os.path.abspath(nsc_dir)
+        elif os.path.isdir(nsc_release_dir):
+            conf.check_message("NSC location", '', True, ("%s (guessed)" % nsc_release_dir))
+            conf.env['WITH_NSC'] = os.path.abspath(nsc_release_dir)
+        del nsc_dir
+        del nsc_release_dir
+
+    if not conf.env['WITH_NSC']:
+        conf.check_message("NSC location", '', False)
+        conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
+                                     "NSC not found (see option --with-nsc)")
+	return
+    
+    if sys.platform in ['linux2']:
+        arch = os.uname()[4]
+    else:
+        arch = None
+    ok = False
+    if arch in ('x86_64', 'i686', 'i586', 'i486', 'i386'):
+        conf.env['NSC_ENABLED'] = True
+        conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE')
+        conf.check(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
+        ok = True
+    conf.check_message('NSC supported architecture', arch, ok)
+    
+    if not ok:
+        conf.env['NSC_ENABLED'] = False
+        conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
+                                     "architecture %r not supported" % arch)
+        return
+
+    lib_to_check = 'liblinux2.6.26.so'
+
+    if not os.path.exists(os.path.join(conf.env['WITH_NSC'], lib_to_check)):
+        conf.env['NSC_ENABLED'] = False
+        conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
+            "NSC library %s is missing: NSC has not been built?" % lib_to_check)
+        return
+
+    # append the NSC kernel dirs to the module path so that these dirs
+    # will end up in the LD_LIBRARY_PATH, thus allowing the NSC NS-3
+    # module to find the necessary NSC shared libraries.
+    for nsc_module in ['linux-2.6.18', 'linux-2.6.26']:
+        conf.env.append_value('NS3_MODULE_PATH',
+                              os.path.abspath(os.path.join(conf.env['WITH_NSC'], nsc_module)))
+
+    conf.report_optional_feature("nsc", "Network Simulation Cradle", True, "")
+
+
+
+def build(bld):
+    # bridge and mpi dependencies are due to global routing
+    obj = bld.create_ns3_module('internet', ['bridge', 'mpi', 'network'])
+    obj.source = [
+        'test/tcp-test.cc',
+        'test/udp-test.cc',
+        'test/ipv4-test.cc',
+        'test/ipv4-raw-test.cc',
+        'model/ipv4-l4-protocol.cc',
+        'model/udp-header.cc',
+        'model/tcp-header.cc',
+        'model/ipv4-interface.cc',
+        'model/ipv4-l3-protocol.cc',
+        'model/ipv4-end-point.cc',
+        'model/udp-l4-protocol.cc',
+        'model/tcp-l4-protocol.cc',
+        'model/arp-header.cc',
+        'model/arp-cache.cc',
+        'model/arp-l3-protocol.cc',
+        'model/udp-socket-impl.cc',
+        'model/ipv4-end-point-demux.cc',
+        'model/udp-socket-factory-impl.cc',
+        'model/tcp-socket-factory-impl.cc',
+        'model/pending-data.cc',
+        'model/rtt-estimator.cc',
+        'model/ipv4-raw-socket-factory-impl.cc',
+        'model/ipv4-raw-socket-impl.cc',
+        'model/icmpv4.cc',
+        'model/icmpv4-l4-protocol.cc',
+        'model/loopback-net-device.cc',
+        'model/ndisc-cache.cc',
+        'model/ipv6-interface.cc',
+        'model/icmpv6-header.cc',
+        'model/ipv6-l3-protocol.cc',
+        'model/ipv6-end-point.cc',
+        'model/ipv6-end-point-demux.cc',
+        'model/ipv6-l4-protocol.cc',
+        'model/ipv6-raw-socket-factory-impl.cc',
+        'model/ipv6-raw-socket-impl.cc',
+        'model/ipv6-autoconfigured-prefix.cc',
+        'model/ipv6-extension.cc',
+        'model/ipv6-extension-header.cc',
+        'model/ipv6-extension-demux.cc',
+        'model/ipv6-option.cc',
+        'model/ipv6-option-header.cc',
+        'model/ipv6-option-demux.cc',
+        'model/icmpv6-l4-protocol.cc',
+        'test/ipv6-test.cc',
+        'test/ipv6-extension-header-test-suite.cc',
+        'model/tcp-socket-base.cc',
+        'model/tcp-rfc793.cc',
+        'model/tcp-tahoe.cc',
+        'model/tcp-reno.cc',
+        'model/tcp-newreno.cc',
+        'model/tcp-rx-buffer.cc',
+        'model/tcp-tx-buffer.cc',
+        'model/ipv4-packet-info-tag.cc',
+        'model/ipv6-packet-info-tag.cc',
+        'model/ipv4-interface-address.cc',
+        'model/ipv4-address-generator.cc',
+        'model/ipv4-header.cc',
+        'model/ipv4-route.cc',
+        'model/ipv4-routing-protocol.cc',
+        'model/udp-socket.cc',
+        'model/udp-socket-factory.cc',
+        'model/tcp-socket.cc',
+        'model/tcp-socket-factory.cc',
+        'model/ipv4.cc',
+        'model/ipv4-raw-socket-factory.cc',
+        'model/ipv6-header.cc',
+        'model/ipv6-interface-address.cc',
+        'model/ipv6-route.cc',
+        'model/ipv6.cc',
+        'model/ipv6-raw-socket-factory.cc',
+        'model/ipv6-routing-protocol.cc',
+        'model/ipv4-list-routing.cc',
+        'model/ipv6-list-routing.cc',
+        'helper/ipv4-list-routing-helper.cc',
+        'helper/ipv6-list-routing-helper.cc',
+        'model/ipv4-static-routing.cc',
+        'model/ipv4-routing-table-entry.cc',
+        'model/ipv6-static-routing.cc',
+        'model/ipv6-routing-table-entry.cc',
+        'helper/ipv4-static-routing-helper.cc',
+        'helper/ipv6-static-routing-helper.cc',
+        'model/global-router-interface.cc',
+        'model/global-route-manager.cc',
+        'model/global-route-manager-impl.cc',
+        'model/candidate-queue.cc',
+        'model/ipv4-global-routing.cc',
+        'helper/ipv4-global-routing-helper.cc',
+        'helper/internet-stack-helper.cc',
+        'helper/ipv4-address-helper.cc',
+        'helper/ipv4-interface-container.cc',
+        'helper/ipv4-routing-helper.cc',
+        'helper/ipv6-address-helper.cc',
+        'helper/ipv6-interface-container.cc',
+        'helper/ipv6-routing-helper.cc',
+        'helper/trace-helper.cc',
+        ]
+
+    headers = bld.new_task_gen('ns3header')
+    headers.module = 'internet'
+    headers.source = [
+        'model/udp-header.h',
+        'model/tcp-header.h',
+        'model/icmpv4.h',
+        'model/icmpv6-header.h',
+        # used by routing
+        'model/ipv4-interface.h',
+        'model/ipv4-l3-protocol.h',
+        'model/ipv6-l3-protocol.h',
+        'model/ipv4-end-point.h',
+        'model/ipv6-extension-header.h',
+        'model/ipv6-option-header.h',
+        'model/arp-l3-protocol.h',
+        'model/udp-l4-protocol.h',
+        'model/tcp-l4-protocol.h',
+        'model/icmpv4-l4-protocol.h',
+        'model/ipv4-l4-protocol.h',
+        'model/arp-header.h',
+        'model/arp-cache.h',
+        'model/icmpv6-l4-protocol.h',
+        'model/ipv6-l4-protocol.h',
+        'model/ipv6-interface.h',
+        'model/ndisc-cache.h',
+        'model/loopback-net-device.h',
+        'model/ipv4-packet-info-tag.h',
+        'model/ipv6-packet-info-tag.h',
+        'model/ipv4-interface-address.h',
+        'model/ipv4-address-generator.h',
+        'model/ipv4-header.h',
+        'model/ipv4-route.h',
+        'model/ipv4-routing-protocol.h',
+        'model/udp-socket.h',
+        'model/udp-socket-factory.h',
+        'model/tcp-socket.h',
+        'model/tcp-socket-factory.h',
+        'model/ipv4.h',
+        'model/ipv4-raw-socket-factory.h',
+        'model/ipv6-header.h',
+        'model/ipv6-interface-address.h',
+        'model/ipv6-route.h',
+        'model/ipv6.h',
+        'model/ipv6-raw-socket-factory.h',
+        'model/ipv6-routing-protocol.h',
+        'model/ipv4-list-routing.h',
+        'model/ipv6-list-routing.h',
+        'helper/ipv4-list-routing-helper.h',
+        'helper/ipv6-list-routing-helper.h',
+        'model/ipv4-static-routing.h',
+        'model/ipv4-routing-table-entry.h',
+        'model/ipv6-static-routing.h',
+        'model/ipv6-routing-table-entry.h',
+        'helper/ipv4-static-routing-helper.h',
+        'helper/ipv6-static-routing-helper.h',
+        'model/global-router-interface.h',
+        'model/global-route-manager.h',
+        'model/ipv4-global-routing.h',
+        'helper/ipv4-global-routing-helper.h',
+        'helper/internet-stack-helper.h',
+        'helper/ipv4-address-helper.h',
+        'helper/ipv4-interface-container.h',
+        'helper/ipv4-routing-helper.h',
+        'helper/ipv6-address-helper.h',
+        'helper/ipv6-interface-container.h',
+        'helper/ipv6-routing-helper.h',
+        'helper/trace-helper.h',
+       ]
+
+    if bld.env['NSC_ENABLED']:
+        obj.source.append ('model/nsc-tcp-socket-impl.cc')
+        obj.source.append ('model/nsc-tcp-l4-protocol.cc')
+        obj.source.append ('model/nsc-tcp-socket-factory-impl.cc')
+        obj.source.append ('model/nsc-sysctl.cc')
+        headers.source.append('model/nsc-tcp-l4-protocol.h')
+        obj.uselib = 'DL'
diff --git a/src/routing/aodv/wscript b/src/routing/aodv/wscript
index ca4c3d2c4..e2b680afa 100644
--- a/src/routing/aodv/wscript
+++ b/src/routing/aodv/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('aodv', ['internet-stack', 'contrib'])
+    module = bld.create_ns3_module('aodv', ['internet', 'contrib'])
     module.includes = '.'
     module.source = [
         'aodv-id-cache.cc',
diff --git a/src/routing/click/examples/wscript b/src/routing/click/examples/wscript
index afc0ae36c..0a73604c2 100644
--- a/src/routing/click/examples/wscript
+++ b/src/routing/click/examples/wscript
@@ -2,21 +2,21 @@
 
 def build(bld):
    obj = bld.create_ns3_program('nsclick-simple-lan',
-                                ['click', 'csma', 'internet-stack'])
+                                ['click', 'csma', 'internet'])
    obj.source = 'nsclick-simple-lan.cc'
 
    obj = bld.create_ns3_program('nsclick-raw-wlan',
-                                ['click', 'wifi', 'internet-stack'])
+                                ['click', 'wifi', 'internet'])
    obj.source = 'nsclick-raw-wlan.cc'
 
    obj = bld.create_ns3_program('nsclick-udp-client-server-csma',
-                                ['click', 'csma', 'internet-stack'])
+                                ['click', 'csma', 'internet'])
    obj.source = 'nsclick-udp-client-server-csma.cc'
 
    obj = bld.create_ns3_program('nsclick-udp-client-server-wifi',
-                                ['click', 'wifi', 'internet-stack'])
+                                ['click', 'wifi', 'internet'])
    obj.source = 'nsclick-udp-client-server-wifi.cc'
 
    obj = bld.create_ns3_program('nsclick-routing',
-                                ['click', 'csma', 'internet-stack'])
+                                ['click', 'csma', 'internet'])
    obj.source = 'nsclick-routing.cc'
diff --git a/src/routing/click/wscript b/src/routing/click/wscript
index 6a486508b..298e9220b 100644
--- a/src/routing/click/wscript
+++ b/src/routing/click/wscript
@@ -69,7 +69,7 @@ int main()
 
 def build(bld):
 
-    module = bld.create_ns3_module('click', ['internet-stack', 'contrib'])
+    module = bld.create_ns3_module('click', ['internet', 'contrib'])
     module.includes = '. CPPPATH_NSCLICK'
     module.source = [
         'model/ipv4-click-routing.cc',
diff --git a/src/routing/dsdv/examples/wscript b/src/routing/dsdv/examples/wscript
index 427b8285e..54440cd54 100644
--- a/src/routing/dsdv/examples/wscript
+++ b/src/routing/dsdv/examples/wscript
@@ -1,6 +1,6 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-     obj = bld.create_ns3_program('dsdv-manet', ['wifi', 'internet-stack', 'dsdv'])
+     obj = bld.create_ns3_program('dsdv-manet', ['wifi', 'internet', 'dsdv'])
      obj.source = 'dsdv-manet.cc'
 
diff --git a/src/routing/dsdv/wscript b/src/routing/dsdv/wscript
index 3d608d7b9..9f4ad7f71 100644
--- a/src/routing/dsdv/wscript
+++ b/src/routing/dsdv/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('dsdv', ['internet-stack', 'contrib', 'wifi', 'helper'])
+    module = bld.create_ns3_module('dsdv', ['internet', 'contrib', 'wifi', 'helper'])
     module.includes = '.'
     module.source = [
         'model/dsdv-rtable.cc',
diff --git a/src/routing/global-routing/waf b/src/routing/global-routing/waf
deleted file mode 100755
index 4283ec141..000000000
--- a/src/routing/global-routing/waf
+++ /dev/null
@@ -1 +0,0 @@
-exec "`dirname "$0"`"/../../../waf "$@"
diff --git a/src/routing/global-routing/wscript b/src/routing/global-routing/wscript
deleted file mode 100644
index 4ad772775..000000000
--- a/src/routing/global-routing/wscript
+++ /dev/null
@@ -1,21 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    module = bld.create_ns3_module('global-routing', ['network', 'helper'])
-    module.source = [
-        'model/global-router-interface.cc',
-        'model/global-route-manager.cc',
-        'model/global-route-manager-impl.cc',
-        'model/candidate-queue.cc',
-        'model/ipv4-global-routing.cc',
-        'helper/ipv4-global-routing-helper.cc',
-        ]
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'global-routing'
-    headers.source = [
-        'model/global-router-interface.h',
-        'model/global-route-manager.h',
-        'model/ipv4-global-routing.h',
-	'helper/ipv4-global-routing-helper.h',
-        ]
-
diff --git a/src/routing/list-routing/wscript b/src/routing/list-routing/wscript
deleted file mode 100644
index dd6a1dfee..000000000
--- a/src/routing/list-routing/wscript
+++ /dev/null
@@ -1,19 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    module = bld.create_ns3_module('list-routing', ['network', 'helper'])
-    module.source = [
-        'model/ipv4-list-routing.cc',
-        'model/ipv6-list-routing.cc',
-        'helper/ipv4-list-routing-helper.cc',
-        'helper/ipv6-list-routing-helper.cc',
-        ]
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'list-routing'
-    headers.source = [
-        'model/ipv4-list-routing.h',
-        'model/ipv6-list-routing.h',
-        'helper/ipv4-list-routing-helper.h',
-        'helper/ipv6-list-routing-helper.h',
-        ]
-
diff --git a/src/routing/nix-vector-routing/wscript b/src/routing/nix-vector-routing/wscript
index d126d2510..e83e66a19 100644
--- a/src/routing/nix-vector-routing/wscript
+++ b/src/routing/nix-vector-routing/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('nix-vector-routing', ['internet-stack', 'contrib'])
+    module = bld.create_ns3_module('nix-vector-routing', ['internet', 'contrib'])
     module.includes = '.'
     module.source = [
         'ipv4-nix-vector-routing.cc',
diff --git a/src/routing/olsr/examples/wscript b/src/routing/olsr/examples/wscript
index 0485a13b3..2e279efbf 100644
--- a/src/routing/olsr/examples/wscript
+++ b/src/routing/olsr/examples/wscript
@@ -2,7 +2,7 @@
 
 def build(bld):
     obj = bld.create_ns3_program('simple-point-to-point-olsr',
-                                 ['point-to-point', 'internet-stack', 'olsr'])
+                                 ['point-to-point', 'internet', 'olsr'])
     obj.source = 'simple-point-to-point-olsr.cc'
 
     obj = bld.create_ns3_program('olsr-hna',
diff --git a/src/routing/olsr/wscript b/src/routing/olsr/wscript
index b80f09a40..797928b1c 100644
--- a/src/routing/olsr/wscript
+++ b/src/routing/olsr/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('olsr', ['internet-stack', 'contrib', 'helper'])
+    module = bld.create_ns3_module('olsr', ['internet', 'contrib', 'helper'])
     module.includes = '.'
     module.source = [
         'model/olsr-header.cc',
diff --git a/src/routing/static-routing/wscript b/src/routing/static-routing/wscript
deleted file mode 100644
index 7c2812e27..000000000
--- a/src/routing/static-routing/wscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    module = bld.create_ns3_module('static-routing', ['network', 'helper'])
-    module.source = [
-        'model/ipv4-static-routing.cc',
-        'model/ipv4-routing-table-entry.cc',
-        'model/ipv6-static-routing.cc',
-        'model/ipv6-routing-table-entry.cc',
-        'helper/ipv4-static-routing-helper.cc',
-        'helper/ipv6-static-routing-helper.cc',
-        ]
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'static-routing'
-    headers.source = [
-        'model/ipv4-static-routing.h',
-        'model/ipv4-routing-table-entry.h',
-        'model/ipv6-static-routing.h',
-        'model/ipv6-routing-table-entry.h',
-        'helper/ipv4-static-routing-helper.h',
-        'helper/ipv6-static-routing-helper.h',
-        ]
-
diff --git a/src/wscript b/src/wscript
index 957e95b6d..fa548a87c 100644
--- a/src/wscript
+++ b/src/wscript
@@ -21,7 +21,7 @@ all_modules = (
     'core',
     'network',
     'contrib',
-    'internet-stack',
+    'internet',
     'propagation',
     'devices/point-to-point',
     'devices/csma',
@@ -35,9 +35,6 @@ all_modules = (
     'applications/bulk-send',
     'routing/nix-vector-routing',
     'routing/olsr',
-    'routing/global-routing',
-    'routing/static-routing',
-    'routing/list-routing',
     'routing/aodv',
     'routing/dsdv',
     'routing/click',
@@ -88,7 +85,7 @@ def configure(conf):
     conf.sub_config('devices/emu')
     conf.sub_config('devices/tap-bridge')
     conf.sub_config('contrib')
-    conf.sub_config('internet-stack')
+    conf.sub_config('internet')
     conf.sub_config('helper')
     conf.sub_config('test')
     conf.sub_config('routing/click')
diff --git a/utils/wscript b/utils/wscript
index 9faa024c4..edbb6c1de 100644
--- a/utils/wscript
+++ b/utils/wscript
@@ -16,6 +16,6 @@ def build(bld):
     obj.source = 'bench-packets.cc'
 
     obj = bld.create_ns3_program('print-introspected-doxygen',
-                                 ['internet-stack', 'csma-cd', 'point-to-point'])
+                                 ['internet', 'csma-cd', 'point-to-point'])
     obj.source = 'print-introspected-doxygen.cc'
 
diff --git a/wscript b/wscript
index 1c1449da2..6d926e2d3 100644
--- a/wscript
+++ b/wscript
@@ -176,7 +176,7 @@ def set_options(opt):
     # options provided in subdirectories
     opt.sub_options('src')
     opt.sub_options('bindings/python')
-    opt.sub_options('src/internet-stack')
+    opt.sub_options('src/internet')
 
 
 def _check_compilation_flag(conf, flag, mode='cxx'):