--- a/SConstruct	Sun Mar 18 14:06:51 2007 -0700
+++ b/SConstruct	Sun Mar 18 14:30:26 2007 -0700
@@ -22,6 +22,8 @@
     'assert.cc',
     'ptr.cc',
     'test.cc',
+    'random-variable.cc',
+    'rng-stream.cc',
     ])
 env = Environment()
 if env['PLATFORM'] == 'posix' or env['PLATFORM'] == 'darwin' or env['PLATFORM'] == 'cygwin':
@@ -44,7 +46,9 @@
     'debug.h',
     'assert.h',
     'fatal-error.h',
-    'test.h'
+    'test.h',
+    'random-variable.h',
+    'rng-stream.h'
     ])
 
 def config_core (env, config):
@@ -192,9 +196,10 @@
     'ipv4.cc',
     'ipv4-end-point.cc',
     'udp-end-point.cc',
-    'udp-socket.cc',
+    'datagram-socket.cc',
     'udp.cc',
     'arp-header.cc',
+    'application.cc',
     'arp-cache.cc',
     'arp-ipv4-interface.cc',
     'arp.cc',
@@ -213,6 +218,7 @@
     'ipv4-checksum.h',
     'udp.h',
     'ipv4-l4-protocol.h',
+    'application.h',
     'arp-header.h',
     'arp-cache-cache.h',
     'arp.h',
@@ -227,7 +233,7 @@
 node.add_inst_headers ([
     'node.h',
     'internet-node.h',
-    'udp-socket.h',
+    'datagram-socket.h',
     'ipv4-address.h',
     'net-device.h',
     'arp-ipv4-interface.h',