diff --git a/src/simulator/event-collector.cc b/src/routing/olsr/event-collector.cc
similarity index 100%
rename from src/simulator/event-collector.cc
rename to src/routing/olsr/event-collector.cc
diff --git a/src/simulator/event-collector.h b/src/routing/olsr/event-collector.h
similarity index 96%
rename from src/simulator/event-collector.h
rename to src/routing/olsr/event-collector.h
index d0e48460d..c29809402 100644
--- a/src/simulator/event-collector.h
+++ b/src/routing/olsr/event-collector.h
@@ -22,8 +22,8 @@
 #define EVENT_COLLECTOR_H
 
 #include <list>
-#include "event-id.h"
-#include "simulator.h"
+#include "ns3/event-id.h"
+#include "ns3/simulator.h"
 
 namespace ns3 {
 
diff --git a/src/routing/olsr/olsr-agent-impl.h b/src/routing/olsr/olsr-agent-impl.h
index 7758664d1..32b1ef347 100644
--- a/src/routing/olsr/olsr-agent-impl.h
+++ b/src/routing/olsr/olsr-agent-impl.h
@@ -39,8 +39,8 @@
 #include "ns3/packet.h"
 #include "ns3/node.h"
 #include "ns3/socket.h"
-#include "ns3/single-event.h"
-#include "ns3/event-collector.h"
+#include "single-event.h"
+#include "event-collector.h"
 
 
 namespace ns3 {
diff --git a/src/simulator/single-event.cc b/src/routing/olsr/single-event.cc
similarity index 100%
rename from src/simulator/single-event.cc
rename to src/routing/olsr/single-event.cc
diff --git a/src/simulator/single-event.h b/src/routing/olsr/single-event.h
similarity index 97%
rename from src/simulator/single-event.h
rename to src/routing/olsr/single-event.h
index ddb8a164c..cb7ab4be5 100644
--- a/src/simulator/single-event.h
+++ b/src/routing/olsr/single-event.h
@@ -22,8 +22,8 @@
 #define SINGLE_EVENT_H
 
 #include <list>
-#include "event-id.h"
-#include "simulator.h"
+#include "ns3/event-id.h"
+#include "ns3/simulator.h"
 
 namespace ns3 {
 
diff --git a/src/routing/olsr/wscript b/src/routing/olsr/wscript
index bc6268f8b..84718ec6b 100644
--- a/src/routing/olsr/wscript
+++ b/src/routing/olsr/wscript
@@ -17,3 +17,10 @@ def build(bld):
         'olsr-agent.h',
         'olsr.h',
         ]
+
+
+    ## globally useful classes, temporarily private...
+    module.source.extend([
+            'event-collector.cc',
+            'single-event.cc',
+            ])
diff --git a/src/simulator/wscript b/src/simulator/wscript
index 01124f5ea..970a43aea 100644
--- a/src/simulator/wscript
+++ b/src/simulator/wscript
@@ -52,8 +52,6 @@ def build(bld):
         'high-precision.cc',
         'time.cc',
         'event-id.cc',
-        'event-collector.cc',
-        'single-event.cc',
         'scheduler.cc',
         'scheduler-factory.cc',
         'scheduler-list.cc',
@@ -69,8 +67,6 @@ def build(bld):
         'high-precision.h',
         'nstime.h',
         'event-id.h',
-        'event-collector.h',
-        'single-event.h',
         'event-impl.h',
         'simulator.h',
         'scheduler.h',