diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3548dda9f..89f5eda14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,14 +90,16 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	dial-plan/dial-plan-p.h
 	dial-plan/dial-plan.h
 	enums.h
-	event-log/call-event.h
-	event-log/chat-message-event.h
-	event-log/conference-event-p.h
-	event-log/conference-event.h
-	event-log/conference-participant-device-event.h
-	event-log/conference-participant-event-p.h
-	event-log/conference-participant-event.h
-	event-log/conference-subject-event.h
+	event-log/call/call-event.h
+	event-log/chat/chat-message-event.h
+	event-log/conference/conference-event-p.h
+	event-log/conference/conference-event.h
+	event-log/conference/conference-notified-event-p.h
+	event-log/conference/conference-notified-event.h
+	event-log/conference/conference-participant-device-event.h
+	event-log/conference/conference-participant-event-p.h
+	event-log/conference/conference-participant-event.h
+	event-log/conference/conference-subject-event.h
 	event-log/event-log-p.h
 	event-log/event-log.h
 	hacks/hacks.h
@@ -170,12 +172,13 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	db/session/db-session-provider.cpp
 	db/session/db-session.cpp
 	dial-plan/dial-plan.cpp
-	event-log/call-event.cpp
-	event-log/chat-message-event.cpp
-	event-log/conference-event.cpp
-	event-log/conference-participant-device-event.cpp
-	event-log/conference-participant-event.cpp
-	event-log/conference-subject-event.cpp
+	event-log/call/call-event.cpp
+	event-log/chat/chat-message-event.cpp
+	event-log/conference/conference-event.cpp
+	event-log/conference/conference-notified-event.cpp
+	event-log/conference/conference-participant-device-event.cpp
+	event-log/conference/conference-participant-event.cpp
+	event-log/conference/conference-subject-event.cpp
 	event-log/event-log.cpp
 	hacks/hacks.cpp
 	logger/logger.cpp
diff --git a/src/c-wrapper/api/c-event-log.cpp b/src/c-wrapper/api/c-event-log.cpp
index 77dd75244..e3e8cd467 100644
--- a/src/c-wrapper/api/c-event-log.cpp
+++ b/src/c-wrapper/api/c-event-log.cpp
@@ -23,9 +23,9 @@
 #include "c-wrapper/c-wrapper.h"
 #include "call/call.h"
 #include "chat/chat-message/chat-message.h"
-#include "event-log/call-event.h"
-#include "event-log/chat-message-event.h"
-#include "event-log/conference-participant-event.h"
+#include "event-log/call/call-event.h"
+#include "event-log/chat/chat-message-event.h"
+#include "event-log/conference/conference-participant-event.h"
 
 // =============================================================================
 
diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 6ad867efe..4576ebb32 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -31,10 +31,10 @@
 #include "content/content-type.h"
 #include "content/content.h"
 #include "db/session/db-session-provider.h"
-#include "event-log/call-event.h"
-#include "event-log/chat-message-event.h"
-#include "event-log/conference-participant-device-event.h"
-#include "event-log/conference-subject-event.h"
+#include "event-log/call/call-event.h"
+#include "event-log/chat/chat-message-event.h"
+#include "event-log/conference/conference-participant-device-event.h"
+#include "event-log/conference/conference-subject-event.h"
 #include "event-log/event-log-p.h"
 #include "logger/logger.h"
 #include "main-db-p.h"
diff --git a/src/dial-plan/dial-plan.h b/src/dial-plan/dial-plan.h
index b25a8853e..f7f51ec8d 100644
--- a/src/dial-plan/dial-plan.h
+++ b/src/dial-plan/dial-plan.h
@@ -21,6 +21,7 @@
 #define _DIAL_PLAN_H_
 
 #include <list>
+
 #include "object/clonable-object.h"
 
 // =============================================================================
@@ -34,7 +35,7 @@ public:
 	DialPlan (const std::string &country = "", const std::string &isoCountryCode = "", const std::string &ccc = "", int nnl = 0, const std::string &icp = "");
 	DialPlan (const DialPlan &src);
 	~DialPlan ();
-	
+
 	DialPlan &operator= (const DialPlan &src);
 
 	const std::string& getCountry() const;
@@ -54,7 +55,7 @@ public:
 
 private:
 	static std::list<DialPlan> const DialPlans;
-	
+
 	L_DECLARE_PRIVATE(DialPlan);
 };
 
diff --git a/src/event-log/call-event.cpp b/src/event-log/call/call-event.cpp
similarity index 98%
rename from src/event-log/call-event.cpp
rename to src/event-log/call/call-event.cpp
index 6f7a50173..b4d6be335 100644
--- a/src/event-log/call-event.cpp
+++ b/src/event-log/call/call-event.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "call-event.h"
-#include "event-log-p.h"
+#include "event-log/event-log-p.h"
 
 // =============================================================================
 
diff --git a/src/event-log/call-event.h b/src/event-log/call/call-event.h
similarity index 97%
rename from src/event-log/call-event.h
rename to src/event-log/call/call-event.h
index 532da7805..85ae6c28d 100644
--- a/src/event-log/call-event.h
+++ b/src/event-log/call/call-event.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-#include "event-log.h"
+#include "event-log/event-log.h"
 
 // =============================================================================
 
diff --git a/src/event-log/chat-message-event.cpp b/src/event-log/chat/chat-message-event.cpp
similarity index 98%
rename from src/event-log/chat-message-event.cpp
rename to src/event-log/chat/chat-message-event.cpp
index 6c1e57419..6e26e48e3 100644
--- a/src/event-log/chat-message-event.cpp
+++ b/src/event-log/chat/chat-message-event.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "chat-message-event.h"
-#include "event-log-p.h"
+#include "event-log/event-log-p.h"
 
 // =============================================================================
 
diff --git a/src/event-log/chat-message-event.h b/src/event-log/chat/chat-message-event.h
similarity index 97%
rename from src/event-log/chat-message-event.h
rename to src/event-log/chat/chat-message-event.h
index bbe95baf8..becbdadd8 100644
--- a/src/event-log/chat-message-event.h
+++ b/src/event-log/chat/chat-message-event.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-#include "event-log.h"
+#include "event-log/event-log.h"
 
 // =============================================================================
 
diff --git a/src/event-log/conference-event-p.h b/src/event-log/conference/conference-event-p.h
similarity index 97%
rename from src/event-log/conference-event-p.h
rename to src/event-log/conference/conference-event-p.h
index f88f80752..85e7ae92e 100644
--- a/src/event-log/conference-event-p.h
+++ b/src/event-log/conference/conference-event-p.h
@@ -22,7 +22,7 @@
 
 #include "address/address.h"
 #include "conference-event.h"
-#include "event-log-p.h"
+#include "event-log/event-log-p.h"
 
 // =============================================================================
 
diff --git a/src/event-log/conference-event.cpp b/src/event-log/conference/conference-event.cpp
similarity index 100%
rename from src/event-log/conference-event.cpp
rename to src/event-log/conference/conference-event.cpp
diff --git a/src/event-log/conference-event.h b/src/event-log/conference/conference-event.h
similarity index 97%
rename from src/event-log/conference-event.h
rename to src/event-log/conference/conference-event.h
index b2d791f2b..05fb34dc4 100644
--- a/src/event-log/conference-event.h
+++ b/src/event-log/conference/conference-event.h
@@ -20,7 +20,7 @@
 #ifndef _CONFERENCE_EVENT_H_
 #define _CONFERENCE_EVENT_H_
 
-#include "event-log.h"
+#include "event-log/event-log.h"
 
 // =============================================================================
 
diff --git a/src/event-log/conference/conference-notified-event-p.h b/src/event-log/conference/conference-notified-event-p.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/event-log/conference/conference-notified-event.cpp b/src/event-log/conference/conference-notified-event.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/event-log/conference/conference-notified-event.h b/src/event-log/conference/conference-notified-event.h
new file mode 100644
index 000000000..5e87cf8bb
--- /dev/null
+++ b/src/event-log/conference/conference-notified-event.h
@@ -0,0 +1,50 @@
+/*
+ * conference-notified-event.h
+ * Copyright (C) 2010-2017 Belledonne Communications SARL
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _CONFERENCE_NOTIFIED_EVENT_H_
+#define _CONFERENCE_NOTIFIED_EVENT_H_
+
+#include "conference-event.h"
+
+// =============================================================================
+
+LINPHONE_BEGIN_NAMESPACE
+
+class Address;
+class ConferenceNotifiedEventPrivate;
+
+class LINPHONE_PUBLIC ConferenceNotifiedEvent : public EventLog {
+public:
+	ConferenceNotifiedEvent (Type type, std::time_t time, const Address &conferenceAddress);
+	ConferenceNotifiedEvent (const ConferenceNotifiedEvent &src);
+
+	ConferenceNotifiedEvent &operator= (const ConferenceNotifiedEvent &src);
+
+	const Address &getConferenceAddress () const;
+
+protected:
+	ConferenceNotifiedEvent (ConferenceNotifiedEventPrivate &p, Type type, std::time_t time, const Address &conferenceAddress);
+
+private:
+	L_DECLARE_PRIVATE(ConferenceNotifiedEvent);
+};
+
+LINPHONE_END_NAMESPACE
+
+#endif // ifndef _CONFERENCE_NOTIFIED_EVENT_H_
diff --git a/src/event-log/conference-participant-device-event.cpp b/src/event-log/conference/conference-participant-device-event.cpp
similarity index 100%
rename from src/event-log/conference-participant-device-event.cpp
rename to src/event-log/conference/conference-participant-device-event.cpp
diff --git a/src/event-log/conference-participant-device-event.h b/src/event-log/conference/conference-participant-device-event.h
similarity index 100%
rename from src/event-log/conference-participant-device-event.h
rename to src/event-log/conference/conference-participant-device-event.h
diff --git a/src/event-log/conference-participant-event-p.h b/src/event-log/conference/conference-participant-event-p.h
similarity index 100%
rename from src/event-log/conference-participant-event-p.h
rename to src/event-log/conference/conference-participant-event-p.h
diff --git a/src/event-log/conference-participant-event.cpp b/src/event-log/conference/conference-participant-event.cpp
similarity index 100%
rename from src/event-log/conference-participant-event.cpp
rename to src/event-log/conference/conference-participant-event.cpp
diff --git a/src/event-log/conference-participant-event.h b/src/event-log/conference/conference-participant-event.h
similarity index 100%
rename from src/event-log/conference-participant-event.h
rename to src/event-log/conference/conference-participant-event.h
diff --git a/src/event-log/conference-subject-event.cpp b/src/event-log/conference/conference-subject-event.cpp
similarity index 100%
rename from src/event-log/conference-subject-event.cpp
rename to src/event-log/conference/conference-subject-event.cpp
diff --git a/src/event-log/conference-subject-event.h b/src/event-log/conference/conference-subject-event.h
similarity index 100%
rename from src/event-log/conference-subject-event.h
rename to src/event-log/conference/conference-subject-event.h