diff --git a/pyiec61850/eventHandler.hpp b/pyiec61850/eventHandlers/eventHandler.hpp
similarity index 100%
rename from pyiec61850/eventHandler.hpp
rename to pyiec61850/eventHandlers/eventHandler.hpp
diff --git a/pyiec61850/gooseHandler.hpp b/pyiec61850/eventHandlers/gooseHandler.hpp
similarity index 100%
rename from pyiec61850/gooseHandler.hpp
rename to pyiec61850/eventHandlers/gooseHandler.hpp
diff --git a/pyiec61850/reportControlBlockHandler.hpp b/pyiec61850/eventHandlers/reportControlBlockHandler.hpp
similarity index 100%
rename from pyiec61850/reportControlBlockHandler.hpp
rename to pyiec61850/eventHandlers/reportControlBlockHandler.hpp
diff --git a/pyiec61850/iec61850.i b/pyiec61850/iec61850.i
index f638aa35..a99b01cb 100644
--- a/pyiec61850/iec61850.i
+++ b/pyiec61850/iec61850.i
@@ -97,14 +97,14 @@ void GooseSubscriber_setDstMac(GooseSubscriber subscriber,
 %feature("director") RCBHandler;
 %feature("director") GooseHandler;
 %{
-#include "eventHandler.hpp"
-#include "reportControlBlockHandler.hpp"
-#include "gooseHandler.hpp"
+#include "eventHandlers/eventHandler.hpp"
+#include "eventHandlers/reportControlBlockHandler.hpp"
+#include "eventHandlers/gooseHandler.hpp"
 EventSubscriber* EventSubscriber::m_last_created_event_subscriber = nullptr;
 %}
-%include "eventHandler.hpp"
-%include "reportControlBlockHandler.hpp"
-%include "gooseHandler.hpp"
+%include "eventHandlers/eventHandler.hpp"
+%include "eventHandlers/reportControlBlockHandler.hpp"
+%include "eventHandlers/gooseHandler.hpp"
 
 /* Goose Publisher section */
 %{