--- a/src/core/wscript	Tue Jun 12 11:37:56 2007 +0200
+++ b/src/core/wscript	Tue Jun 12 14:05:01 2007 +0100
@@ -32,7 +32,6 @@
         'test.cc',
         'random-variable.cc',
         'rng-stream.cc',
-        'interface.cc',
         'uid-manager.cc',
         'default-value.cc',
         'command-line.cc',
@@ -52,6 +51,7 @@
     headers = bld.create_obj('ns3header')
     headers.source = [
         'system-wall-clock-ms.h',
+        'empty.h',
         'callback.h',
         'ptr.h',
         'object.h',
@@ -61,7 +61,6 @@
         'test.h',
         'random-variable.h',
         'rng-stream.h',
-        'interface.h',
         'default-value.h',
         'command-line.h',
         'type-name.h',

--- a/src/internet-node/wscript	Tue Jun 12 11:37:56 2007 +0200
+++ b/src/internet-node/wscript	Tue Jun 12 14:05:01 2007 +0100
@@ -8,7 +8,6 @@
     obj.uselib_local = ['ns3-node', 'ns3-applications']
     obj.source = [
         'internet-node.cc',
-        'node-impl.cc',
         'l3-demux.cc',
         'l3-protocol.cc',
         'ipv4-l4-demux.cc',
@@ -17,23 +16,23 @@
         'udp-header.cc',
         'ipv4-checksum.cc',
         'ipv4-interface.cc',
-        'ipv4.cc',
+        'ipv4-l3-protocol.cc',
         'ipv4-end-point.cc',
-        'udp.cc',
+        'udp-l4-protocol.cc',
         'arp-header.cc',
         'arp-cache.cc',
         'arp-ipv4-interface.cc',
-        'arp.cc',
+        'arp-l3-protocol.cc',
         'ipv4-loopback-interface.cc',
         'header-utils.cc',
         'udp-socket.cc',
         'ipv4-end-point-demux.cc',
-        'i-udp-impl.cc',
-        'i-arp-private.cc',
-        'i-ipv4-impl.cc',
-        'i-ipv4-private.cc',
+        'arp-private.cc',
+        'ipv4-impl.cc',
+        'ipv4-private.cc',
         'ascii-trace.cc',
         'pcap-trace.cc',
+        'udp-impl.cc',
         ]
 
     headers = bld.create_obj('ns3header')

--- a/src/node/wscript	Tue Jun 12 11:37:56 2007 +0200
+++ b/src/node/wscript	Tue Jun 12 14:05:01 2007 +0100
@@ -14,13 +14,13 @@
         'llc-snap-header.cc',
         'ipv4-route.cc',
         'queue.cc',
-        'drop-tail.cc',
+        'drop-tail-queue.cc',
         'channel.cc',
         'node-list.cc',
         'socket.cc',
-        'i-socket-factory.cc',
-        'i-udp.cc',
-        'i-ipv4.cc',
+        'socket-factory.cc',
+        'udp.cc',
+        'ipv4.cc',
         'application.cc',
         ]
 
@@ -32,13 +32,13 @@
         'mac-address.h',
         'ipv4-route.h',
         'queue.h',
-        'drop-tail.h',
+        'drop-tail-queue.h',
         'llc-snap-header.h',
         'channel.h',
         'node-list.h',
         'socket.h',
-        'i-socket-factory.h',
-        'i-udp.h',
-        'i-ipv4.h',
+        'socket-factory.h',
+        'udp.h',
+        'ipv4.h',
         'application.h',
         ]